[zanata/zanata] e41f42: Merge commits that were added to master instead of...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: e41f42cea90ad3113998adb1e8967791e7c98c99
      https://github.com/zanata/zanata/commit/e41f42cea90ad3113998adb1e8967791e7c98c99
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Merge commits that were added to master instead of integration


  Commit: 2c24b4e61c9ed3f437df258ae1992f725266e48f
      https://github.com/zanata/zanata/commit/2c24b4e61c9ed3f437df258ae1992f725266e48f
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Log Message:
  -----------
  Merge commit 'e41f42cea90ad3113998adb1e8967791e7c98c99' into HEAD


Compare: https://github.com/zanata/zanata/compare/74b6981...2c24b4e