[zanata/zanata] f13c36: Update changelog

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: f13c360b433d239b01dd20a15b8da39f0b9bee8c
      https://github.com/zanata/zanata/commit/f13c360b433d239b01dd20a15b8da39f0b9bee8c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog


  Commit: 072a19dbaa3b8202d44da9ae706274c0cfe28979
      https://github.com/zanata/zanata/commit/072a19dbaa3b8202d44da9ae706274c0cfe28979
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release zanata-1.4.5-alpha-1


  Commit: e8a9a647342a3c01a879d30531f42646abebe2ac
      https://github.com/zanata/zanata/commit/e8a9a647342a3c01a879d30531f42646abebe2ac
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

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


  Commit: 046f61baac9fd91b1fc45fc570b1e89734a9c664
      https://github.com/zanata/zanata/commit/046f61baac9fd91b1fc45fc570b1e89734a9c664
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	CHANGELOG.md
	client/pom.xml
	client/zanata-adapter-properties/pom.xml
	client/zanata-adapter-xliff/pom.xml
	client/zanata-client-ant-po/pom.xml
	client/zanata-client-ant-properties/pom.xml
	client/zanata-client-commands/pom.xml
	client/zanata-maven-plugin/pom.xml
	common/pom.xml
	common/zanata-adapter-po/pom.xml
	common/zanata-common-api/pom.xml
	common/zanata-common-util/pom.xml
	common/zanata-rest-client/pom.xml
	pom.xml
	server/pom.xml
	server/zanata-model/pom.xml
	server/zanata-war/pom.xml
	zanata-parent/pom.xml


Compare: https://github.com/zanata/zanata/compare/62048d1...046f61b