[zanata/zanata-server] 1569bf: fix(merge translation): fix merge translation exce...

Wed Apr 6 00:00:29 UTC 2016

  Branch: refs/heads/ZNTA-1013
  Home:   https://github.com/zanata/zanata-server
  Commit: 1569bfc44386022c78ac82d48119cec320b0d08a
      https://github.com/zanata/zanata-server/commit/1569bfc44386022c78ac82d48119cec320b0d08a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  fix(merge translation): fix merge translation exception with new translation

https://zanata.atlassian.net/browse/ZNTA-1013