[zanata/zanata-server] d085bc: Merge branch 'integration/master' into rhbz1062476...

[GitHub]

  Branch: refs/heads/rhbz1062476-glossary-upload
  Home:   https://github.com/zanata/zanata-server
  Commit: d085bcaf18782be3fa4993e66e7a5aef4e0cccdf
      https://github.com/zanata/zanata-server/commit/d085bcaf18782be3fa4993e66e7a5aef4e0cccdf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1062476-glossary-upload