[zanata/zanata-server] d90b3d: Fix language sorting in members size: https://bugz...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: d90b3d3b899ca5daba661646e0667da146e25cd5
      https://github.com/zanata/zanata-server/commit/d90b3d3b899ca5daba661646e0667da146e25cd5
  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/SupportedLanguageAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Fix language sorting in members size: https://bugzilla.redhat.com/show_bug.cgi?id=1205468


  Commit: cabb3de7dfa49f075749263d806eda143e5ba7a8
      https://github.com/zanata/zanata-server/commit/cabb3de7dfa49f075749263d806eda143e5ba7a8
  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/SupportedLanguageAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Merge pull request #746 from zanata/rhbz1205468

Fix language sorting in members size


  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


Compare: https://github.com/zanata/zanata-server/compare/0ea0d3c3fb48...5236705fbb0e