[zanata/zanata-client] 96c480: Merge branch 'integration/master' of github.com:za...

[GitHub]

  Branch: refs/heads/raw-file-upload
  Home:   https://github.com/zanata/zanata-client
  Commit: 96c4806e7bfb939d77c10ed85c68553954770c25
      https://github.com/zanata/zanata-client/commit/96c4806e7bfb939d77c10ed85c68553954770c25
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java

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


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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update common version


  Commit: c8fece5087ba39002e5fc33aa685d745ea275253
      https://github.com/zanata/zanata-client/commit/c8fece5087ba39002e5fc33aa685d745ea275253
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-09 (Tue, 09 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.3


  Commit: f8c1d659a9ec64389244eec260f9f10daa3027f0
      https://github.com/zanata/zanata-client/commit/f8c1d659a9ec64389244eec260f9f10daa3027f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-09 (Tue, 09 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: 7bc5e043f8803543d3bbc6335238946121024704
      https://github.com/zanata/zanata-client/commit/7bc5e043f8803543d3bbc6335238946121024704
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M pom.xml
    M zanata-client-ant-properties/pom.xml
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

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


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

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  rhbz865668 Delete source docs only when source push is enabled


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

  Changed paths:
    M pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  Merge branch 'release'

Conflicts:
	pom.xml
	zanata-client-ant-po/pom.xml
	zanata-client-ant-properties/pom.xml
	zanata-client-commands/pom.xml
	zanata-maven-plugin/pom.xml
	zanata-rest-client/pom.xml


  Commit: 67adb17600fa6537178763c92b0c07f867544a31
      https://github.com/zanata/zanata-client/commit/67adb17600fa6537178763c92b0c07f867544a31
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

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


  Commit: 3b09088581e459ba0c5bf824d57fa2518bd62cd1
      https://github.com/zanata/zanata-client/commit/3b09088581e459ba0c5bf824d57fa2518bd62cd1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  Merge branch 'master' into raw-file-upload


Compare: https://github.com/zanata/zanata-client/compare/201e59bc3159...3b09088581e4