[zanata/zanata-platform] 0d1dee: WIP

[GitHub]

  Branch: refs/heads/ZNTA-1865-version-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: 0d1dee5711edf8d0f3f334c09918383cfe27e7a0
      https://github.com/zanata/zanata-platform/commit/0d1dee5711edf8d0f3f334c09918383cfe27e7a0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java

  Log Message:
  -----------
  WIP