[zanata/zanata-server] 712deb: Fix email message generated when user joining team

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 712debfdda2621d642585b484109c0cf01e97f32
      https://github.com/zanata/zanata-server/commit/712debfdda2621d642585b484109c0cf01e97f32
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

  Log Message:
  -----------
  Fix email message generated when user joining team


  Commit: 2b0666c5f2b037ae6279e0b809f552067b475ff5
      https://github.com/zanata/zanata-server/commit/2b0666c5f2b037ae6279e0b809f552067b475ff5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

  Log Message:
  -----------
  Merge pull request #1026 from zanata/fix-email-message

Fix email message generated when user joining team


  Commit: e78f3e5c4748ae4e69112872dc9d5dfe09999c11
      https://github.com/zanata/zanata-server/commit/e78f3e5c4748ae4e69112872dc9d5dfe09999c11
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm

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


Compare: https://github.com/zanata/zanata-server/compare/6613309dabb3...e78f3e5c4748