[zanata/zanata-server] d3a22b: Merge remote-tracking branch 'origin/release' into...

[GitHub]

  Branch: refs/heads/merge-release
  Home:   https://github.com/zanata/zanata-server
  Commit: d3a22b2d3ec8deaee4a343feb6f6d539c698471d
      https://github.com/zanata/zanata-server/commit/d3a22b2d3ec8deaee4a343feb6f6d539c698471d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into merge-release

Conflicts:
	docs/release-notes.md