[zanata/zanata-api] 3334e5: prepare for next development iteration

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-api
  Commit: 3334e5f4a5b475d7f290c7d7aaa4fcdc3a99da8f
      https://github.com/zanata/zanata-api/commit/3334e5f4a5b475d7f290c7d7aaa4fcdc3a99da8f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

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

  Log Message:
  -----------
  prepare for next development iteration


  Commit: f674cdd44409c5067075eb9cd6d597b266f05df3
      https://github.com/zanata/zanata-api/commit/f674cdd44409c5067075eb9cd6d597b266f05df3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into integration/master

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


Compare: https://github.com/zanata/zanata-api/compare/84990ee2a86f...f674cdd44409