tree 39dc954c22a4b2657552a1d41462f4919b777c66
parent dfd895e35147953d362b29b78123f8558e57d684
parent f855f399f8ce740e08ddc48c0694c1c076fa69dd
author Shawn O. Pearce <sop@google.com> 1281656522 -0700
committer Shawn O. Pearce <sop@google.com> 1281656522 -0700

Merge branch 'master' into exp-nosql

* master:
  Fix all of our pom.xml versions to be 2.1-SNAPSHOT
  Use internal templates to simplify minor formatting commands.
  Convert 3 email classes to file based templates.
  Convert the Abandoned and MergeFail email classes to templates
  Use a template to set the contents of the CommentEmails.
  Use a template to set the footer on ChangeEmails.
  Use a template to set the contents of the MergedEmails.
  Use a template to set the subject line.
  Add framework for using velocity templates in email classes
  Add ability to deactivate a user when they leave the project.

Conflicts:
	gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java
	gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java
	gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
	gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
	gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
	gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java

Change-Id: Iac92b56e10f9cc4063fc0ec3cea6c79a5a087994