[zanata/zanata-parent] e2dde9: Resync pom from maven central

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-parent
  Commit: e2dde9ea5bc0bdb882939065541a3437d6944503
      https://github.com/zanata/zanata-parent/commit/e2dde9ea5bc0bdb882939065541a3437d6944503
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-16 (Fri, 16 May 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Resync pom from maven central


  Commit: 5cc520220f0c60a1cf9d2613b79e96a3cb7ae6dd
      https://github.com/zanata/zanata-parent/commit/5cc520220f0c60a1cf9d2613b79e96a3cb7ae6dd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-16 (Fri, 16 May 2014)

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

Conflicts:
	pom.xml


Compare: https://github.com/zanata/zanata-parent/compare/c3d4e421224a...5cc520220f0c