[zanata/zanata-server] 17c4c6: fix rebase error

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 17c4c6e16ee295e78c874f2c3d870e0ca18ebec3
      https://github.com/zanata/zanata-server/commit/17c4c6e16ee295e78c874f2c3d870e0ca18ebec3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix rebase error