[zanata/zanata-server] 523670: Merge branch 'release' into integration/master

[GitHub]

  Branch: refs/heads/update-release-notes
  Home:   https://github.com/zanata/zanata-server
  Commit: 5236705fbb0e54819aaedd24cda8fae527b18f22
      https://github.com/zanata/zanata-server/commit/5236705fbb0e54819aaedd24cda8fae527b18f22
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
	zanata-war/src/main/webapp/language/home.xhtml


  Commit: a655443c537dc2de1f345cf98f1b337e0b706230
      https://github.com/zanata/zanata-server/commit/a655443c537dc2de1f345cf98f1b337e0b706230
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Move release notes into readthedocs


Compare: https://github.com/zanata/zanata-server/compare/5236705fbb0e^...a655443c537d