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

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-api
  Commit: c86aed5a670ba7873ae3c990810f699bef88fb57
      https://github.com/zanata/zanata-api/commit/c86aed5a670ba7873ae3c990810f699bef88fb57
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-15 (Tue, 15 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/dto/Glossary.java
    M zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M zanata-common-api/src/test/java/org/zanata/rest/dto/v1/JaxbTestUtil.java

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