tree a362c377f1ade00d478675f0d9c7ccd8fa616cbb
parent 29040d9b4ac4aa0ed1e6e676c6cc3cda36e17aa4
parent 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8a
author David Pursehouse <david.pursehouse@sonymobile.com> 1425347012 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1425347012 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Maven: use same version number for plugin version and API version
  Maven: Add missing junit dependency

Conflicts:
	lib/gerrit/BUCK
	pom.xml

Change-Id: I203ddb3be86d3de64c79e3f3ce4df1bedcf03a07