[zanata/zanata-api] fafd14: Add getTranslationMemory

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-api
  Commit: fafd14c2a3b6257330fa82881507fde63c42bfd4
      https://github.com/zanata/zanata-api/commit/fafd14c2a3b6257330fa82881507fde63c42bfd4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java

  Log Message:
  -----------
  Add getTranslationMemory


  Commit: dd57e2f3377d0252d36a23bd6f90e576a7a4ff40
      https://github.com/zanata/zanata-api/commit/dd57e2f3377d0252d36a23bd6f90e576a7a4ff40
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata-api into tm-import

Conflicts:
	zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java


Compare: https://github.com/zanata/zanata-api/compare/5e2503fc602e...dd57e2f3377d