Shawn Pearce fa06730419 Merge branch 'stable-2.9'
* stable-2.9:
  Replace icon for merge commit
  Make EmailArguments public to allow sending mails from plugins

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java

Change-Id: Icbf07da888ec07fc60409c1d987cf96359f3533d
2014-05-20 11:12:15 -07:00
..