tree b68b61b00d5f36bda6c08fc9e8020e889e0db519
parent 6754c8a1cba5545cfb7aee4dda8708a00f2132c5
parent 4ab88724fe155aa7efb1aafe3fe00733e690ecf0
author Shawn Pearce <sop@google.com> 1381251748 -0700
committer Shawn Pearce <sop@google.com> 1381251748 -0700

Merge branch 'stable-2.7'

* stable-2.7:
  Fix javadoc generation for gerrit extension and plugin API

Conflicts:
	gerrit-extension-api/pom.xml
	gerrit-plugin-api/pom.xml

Change-Id: Ic43483a8328b807e265b237a5cbb931cc50d0439