9954c4e249bd863511ba3c6a8ad94220abbc0d06 - gerrit

commit: 9954c4e249bd863511ba3c6a8ad94220abbc0d06
[log]
author: Shawn Pearce <sop@google.com>
Wed Aug 27 17:15:33 2014 -0700
committer: Shawn Pearce <sop@google.com>
Wed Aug 27 17:15:39 2014 -0700
tree: ea217e72d03c9e0368052003a45d15dfff80d2e7
parent: 05dcd436f610668c11ef460ba15a95d40774e99b [diff]
parent: 7a4cdcd5f85c15996d065ed4860f01b1e6705756 [diff]

Merge branch 'stable-2.9' into stable-2.10

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java

Change-Id: Id716ae24401756b9cfbcb46489259c0d9660412a