[zanata/zanata-client] 2525af: Merge branch 'master' into rhbz1184299

[GitHub]

  Branch: refs/heads/rhbz1184299
  Home:   https://github.com/zanata/zanata-client
  Commit: 2525af18eaa72d7b3e6093f14cbce349b14d0180
      https://github.com/zanata/zanata-client/commit/2525af18eaa72d7b3e6093f14cbce349b14d0180
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M .gitignore
    M stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushMojo.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz1184299