Shawn O. Pearce 6738e5f340 Merge branch 'stable-2.5' ... * stable-2.5: NPE when strategy is cherry-pick and changeMerge.test enabled Fix owner column to link to same status Sort groups on the group list screen Documentation: Add link to test-submit-rule from the prolog cookbook. Do not log RepositoryNotFoundException if non-existing project is accessed Documentation: Add submit rule example on how to implement 1+1=2 Fix OutOfScope exception when auditing ssh auth failure. Fix a NPE caused by GerritCall.getMethod returning null. Add org.apache.mina as dependency to pom.xml Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java Change-Id: Id280ca6afebbe299e5841ddf8850184714f70de7		2012-10-25 13:29:29 -07:00
..
.settings	Remove timestamp from all org.eclipse.core.resources.prefs files.	2012-07-04 14:06:09 +02:00
src	Merge branch 'stable-2.5'	2012-10-25 13:29:29 -07:00
.gitignore	Add Intellij IDEA files to ignore list	2012-05-03 13:17:43 -07:00
pom.xml	Update dependencies to asm 4	2012-09-10 15:58:05 -07:00