[zanata/zanata] 38e14c: Merge branch 'integration/master' of github.com:za...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 38e14cd75c3d1e32c0990299bd441c774536ede4
      https://github.com/zanata/zanata/commit/38e14cd75c3d1e32c0990299bd441c774536ede4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

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


  Commit: 6ecee706ee7a2c7fd89c438faee5dfbd261ca1ce
      https://github.com/zanata/zanata/commit/6ecee706ee7a2c7fd89c438faee5dfbd261ca1ce
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java

  Log Message:
  -----------
  Fix xml entity validation to check only against target string


  Commit: ad71ebf4e929a90ea3fe5694cabf5fa421b72585
      https://github.com/zanata/zanata/commit/ad71ebf4e929a90ea3fe5694cabf5fa421b72585
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java

  Log Message:
  -----------
  Fix null pointer exception when enable log email is true without destination emaikl


  Commit: 3ea4cbd136a5891d839521e79c8c338cf7c2ca9b
      https://github.com/zanata/zanata/commit/3ea4cbd136a5891d839521e79c8c338cf7c2ca9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java

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


  Commit: abf31891cc123c904f8820430391965fc14506a3
      https://github.com/zanata/zanata/commit/abf31891cc123c904f8820430391965fc14506a3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java

  Log Message:
  -----------
  fix unit test


  Commit: 6901655dc9b26c252e0bb38f51e5a46ebfe64c50
      https://github.com/zanata/zanata/commit/6901655dc9b26c252e0bb38f51e5a46ebfe64c50
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java

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


  Commit: cede52be6ba1d214aac35f2cef6f66b399256d47
      https://github.com/zanata/zanata/commit/cede52be6ba1d214aac35f2cef6f66b399256d47
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2012-11-07 (Wed, 07 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java

  Log Message:
  -----------
  Merge commit '6901655dc9b26c252e0bb38f51e5a46ebfe64c50' into HEAD


Compare: https://github.com/zanata/zanata/compare/7b2bad3fcfb3...cede52be6ba1