[zanata/zanata-server] 6f7051: rhbz1099278 Set values needed by email template

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: 6f7051f5c852d405f94825df9feec9c8c22ef0fe
      https://github.com/zanata/zanata-server/commit/6f7051f5c852d405f94825df9feec9c8c22ef0fe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  rhbz1099278 Set values needed by email template


  Commit: 1ca6ac3774d85f92eced5da22602ad2eb9c5f5c5
      https://github.com/zanata/zanata-server/commit/1ca6ac3774d85f92eced5da22602ad2eb9c5f5c5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  Merge pull request #453 from zanata/rhbz1099278

rhbz1099278 Set values needed by email template


Compare: https://github.com/zanata/zanata-server/compare/debfc4ea68f4...1ca6ac3774d8