[zanata/zanata-client] 35095d: Update api and common dependencies

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-client
  Commit: 35095dadf4e5b744cc03fdfb1fa35b46ea3673fc
      https://github.com/zanata/zanata-client/commit/35095dadf4e5b744cc03fdfb1fa35b46ea3673fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update api and common dependencies


  Commit: a19fee6ab5f576316c01ff57d7e0082ca20e54b3
      https://github.com/zanata/zanata-client/commit/a19fee6ab5f576316c01ff57d7e0082ca20e54b3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M pom.xml
    M zanata-client-ant-po/pom.xml
    M zanata-client-ant-properties/pom.xml
    M zanata-client-commands/pom.xml
    M zanata-maven-plugin/pom.xml
    M zanata-rest-client/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release client-1.7.4


  Commit: 4d71ae0224073cf98d539011b0beaad404509808
      https://github.com/zanata/zanata-client/commit/4d71ae0224073cf98d539011b0beaad404509808
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M pom.xml
    M zanata-client-ant-po/pom.xml
    M zanata-client-ant-properties/pom.xml
    M zanata-client-commands/pom.xml
    M zanata-maven-plugin/pom.xml
    M zanata-rest-client/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 440fcac8bd1cab77a811940083cc6fb1b955d9be
      https://github.com/zanata/zanata-client/commit/440fcac8bd1cab77a811940083cc6fb1b955d9be
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge commit '35095da' into integration/master

Conflicts:
	pom.xml


  Commit: b4ae65234a3d0fc3f2fdbf00e6e9f9653bd0566d
      https://github.com/zanata/zanata-client/commit/b4ae65234a3d0fc3f2fdbf00e6e9f9653bd0566d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 0d035f0c4967a1f7743be2008359a49488763ab5
      https://github.com/zanata/zanata-client/commit/0d035f0c4967a1f7743be2008359a49488763ab5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/util/ConsoleUtils.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata-client into integration/master


Compare: https://github.com/zanata/zanata-client/compare/ae89c4bc81dd...0d035f0c4967