[zanata/zanata-client] 0e84b8: Squashed commit of the following:

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-client
  Commit: 0e84b877726a446664fb2b07cc1619f2371eb1bb
      https://github.com/zanata/zanata-client/commit/0e84b877726a446664fb2b07cc1619f2371eb1bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
    M zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java
    M zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.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/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 259510ced07390eb38bd830651cddf1a75954ed4
Merge: fdbdd25 5b902fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jan 14 10:46:48 2015 +1000

    Merge remote-tracking branch 'origin/master' into fix-formatting

    Conflicts:
    	zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    	zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    	zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    	zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java

commit fdbdd25198f8565f633c62f55f8c4ec95d810524
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 15:23:28 2014 +1000

    Update zanata-parent

commit 97d9ac922fd66e704ebc2dd29e0d9b5647e60259
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 11:41:39 2014 +1000

    Fix formatting