[zanata/zanata-server] c21e2c: Merge branch 'master' into ZNTA-1101-project-gloss...

[GitHub]

  Branch: refs/heads/ZNTA-1101-project-glossary
  Home:   https://github.com/zanata/zanata-server
  Commit: c21e2cc375d8c30a71240b1bf8c7f2aeb6de1f87
      https://github.com/zanata/zanata-server/commit/c21e2cc375d8c30a71240b1bf8c7f2aeb6de1f87
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M docker/rundev.sh
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M zanata-frontend/src/frontend/app/actions/glossary.js
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-1101-project-glossary