[zanata/zanata-server] 7c87b4: fix(merge translation):Translation merge targets t...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 7c87b489a6dcfe741bcec209cbf71d01212d88c2
      https://github.com/zanata/zanata-server/commit/7c87b489a6dcfe741bcec209cbf71d01212d88c2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  fix(merge translation):Translation merge targets the wrong source version

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

Squashed commit of the following:

commit d7d15cc50fc625d2d58cd46c626dd18fde2f0f77
Merge: d48dabd adb46eb
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 20 07:58:22 2015 +1000

    Merge branch 'integration/master' into ZTA-719

commit d48dabd75c4766408fbd25d1f74a3eafaff0edd5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 14 08:22:10 2015 +1000

    fix(merge translation):Translation merge targets the wrong source version

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