commit | 137c303fdde92ab8df6df3b2dfb2283a7785418b | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Wed Aug 27 17:18:48 2014 -0700 |
committer | Shawn Pearce <sop@google.com> | Wed Aug 27 17:18:48 2014 -0700 |
tree | fbc004b5ff988af8dbfa52f1fc1da3b0486acc69 | |
parent | bce80ffca44ed7b5385a0820e0b5ab17346c71c1 [diff] | |
parent | 9954c4e249bd863511ba3c6a8ad94220abbc0d06 [diff] |
Merge branch 'stable-2.10' Conflicts: gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java Change-Id: I64ca4005da7d3c676954b4da397e5c9566c934a1