[zanata/zanata-api] 9a656f: Prepare release branch from 1.7.0 tag.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-api
  Commit: 9a656fd5ef214778bd6387ec0cfb4ae86fb99b9d
      https://github.com/zanata/zanata-api/commit/9a656fd5ef214778bd6387ec0cfb4ae86fb99b9d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M pom.xml
    M zanata-common-api/pom.xml

  Log Message:
  -----------
  Prepare release branch from 1.7.0 tag.


  Commit: f2ab3e56ff7f0a4d46f3206cc8b5b3e146d03438
      https://github.com/zanata/zanata-api/commit/f2ab3e56ff7f0a4d46f3206cc8b5b3e146d03438
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/common/CopyTransOptions.java

  Log Message:
  -----------
  rhbz858109 - Add CopTrans option to reuse / ignore translations from different projects.


  Commit: 21e5bbeb479bb6237af8d44b1473716b19d92572
      https://github.com/zanata/zanata-api/commit/21e5bbeb479bb6237af8d44b1473716b19d92572
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/common/CopyTransOptions.java

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

Conflicts:
	pom.xml
	zanata-common-api/pom.xml


Compare: https://github.com/zanata/zanata-api/compare/4013fca0fe1f...21e5bbeb479b