[zanata/zanata-server] f8680c: Add docs for merge-trans feature

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: f8680c0263d19b916850b612f669e15c2906c88c
      https://github.com/zanata/zanata-server/commit/f8680c0263d19b916850b612f669e15c2906c88c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    A docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-progress.png
    A docs/images/version-merge-trans-windows.png
    A docs/images/version-more-action-menu.png
    M docs/release-notes.md
    A docs/user-guide/merge-translations.md
    M mkdocs.yml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Add docs for merge-trans feature