[zanata/zanata-api] 01e2ac: Merge branch 'integration/master' into rhbz1245433...

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-api
  Commit: 01e2ac2cf0a75a7a63298721c02add4f92c52959
      https://github.com/zanata/zanata-api/commit/01e2ac2cf0a75a7a63298721c02add4f92c52959
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-10 (Thu, 10 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