tree ea217e72d03c9e0368052003a45d15dfff80d2e7
parent 05dcd436f610668c11ef460ba15a95d40774e99b
parent 7a4cdcd5f85c15996d065ed4860f01b1e6705756
author Shawn Pearce <sop@google.com> 1409184933 -0700
committer Shawn Pearce <sop@google.com> 1409184939 -0700

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