[zanata/zanata-client] d18663: Merge branch 'master' into ZNTA-44

[GitHub]

  Branch: refs/heads/ZNTA-44
  Home:   https://github.com/zanata/zanata-client
  Commit: d18663ca53482851273cadd25a516207da09ff7c
      https://github.com/zanata/zanata-client/commit/d18663ca53482851273cadd25a516207da09ff7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M .travis.yml
    M docs/release-notes.md
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/pull/GlossaryPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/pull/GlossaryPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/pull/GlossaryPullOptions.java.orig
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/pull/GlossaryPullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java.orig
    M zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPullMojo.java.orig
    R zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java.orig
    M zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/InvalidContentTypeFilter.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/InvalidContentTypeFilterTest.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-44