[zanata-commits] [zanata/zanata] 68b9fb: Merge remote branch 'origin/rhbz720846' into 1.4

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 68b9fbbe558b6bc41481f55f6aadc5f98ceaa5cd
      https://github.com/zanata/zanata/commit/68b9fbbe558b6bc41481f55f6aadc5f98ceaa5cd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/service/CopyTransService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/rhbz720846' into 1.4


  Commit: 880411a598f3ff9895302decd7662085a3836cfc
      https://github.com/zanata/zanata/commit/880411a598f3ff9895302decd7662085a3836cfc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/service/CopyTransService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

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


Compare: https://github.com/zanata/zanata/compare/0999a13...880411a