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

[GitHub]

  Branch: refs/heads/rhbz1184299
  Home:   https://github.com/zanata/zanata-client
  Commit: c21a156264ef2fd6d29517e2bbeab65337351bea
      https://github.com/zanata/zanata-client/commit/c21a156264ef2fd6d29517e2bbeab65337351bea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-29 (Thu, 29 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