[zanata/zanata-api] 9bfe72: Merge branch 'integration/master' into rhbz1245433...

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-api
  Commit: 9bfe72889184d044d2ba1eb51ab19f72f0a6a0ff
      https://github.com/zanata/zanata-api/commit/9bfe72889184d044d2ba1eb51ab19f72f0a6a0ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M .travis.yml
    M pom.xml
    M zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
    M zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java

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