[zanata/zanata-server] 664572: Merge branch 'integration/master' into ZNTA-555-us...

[GitHub]

  Branch: refs/heads/ZNTA-555-user-request
  Home:   https://github.com/zanata/zanata-server
  Commit: 6645723cc7c41efa715c318dce14edafe4707a4e
      https://github.com/zanata/zanata-server/commit/6645723cc7c41efa715c318dce14edafe4707a4e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/requests-tab.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-555-user-request