commit 080a51f4e617c463d13e7568212aeca327a68263
author Shawn O. Pearce <sop@google.com> Tue Jun 07 13:44:39 2011 -0700
committer Shawn O. Pearce <sop@google.com> Tue Jun 07 13:44:39 2011 -0700
tree 2fd212f6f230882f090c5b0ac9b24acac8c8c206
parent 1118daf7793015f1da5c11e2610551cbd1528e3c
parent 019d2c4dfb7351c43858b582ac32bb5e9b176c88

Merge branch 'stable'

* stable:
  Fix ChangeDetailFactory's invocation of PatchSetDetailFactory
  Release notes for 2.1.7.1
  Fix API breakage on ChangeDetailService
  Do not reset Patch History selection on navigation to next file diff
  Resolve Project Owners when checking access right on any ref

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
	gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java

Change-Id: I6e956625cb4648df35035b9be2d32e6e431fb8f3