[zanata/zanata-api] 78ed2f: Add new Translation Memory Services.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-api
  Commit: 78ed2ff56e37e00c9f68e094ffbe7518f46a2cc2
      https://github.com/zanata/zanata-api/commit/78ed2ff56e37e00c9f68e094ffbe7518f46a2cc2
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

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

  Log Message:
  -----------
  Add new Translation Memory Services.

Add new services for deleting and uploading TMs.


  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: 5e2503fc602e158d1ec5bb5d543fc59076a6d279
      https://github.com/zanata/zanata-api/commit/5e2503fc602e158d1ec5bb5d543fc59076a6d279
  Author: Sean Flanigan <sflaniga 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:
  -----------
  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


  Commit: dabf4a21b7bbbb2859f3e12e20e0364f568ae033
      https://github.com/zanata/zanata-api/commit/dabf4a21b7bbbb2859f3e12e20e0364f568ae033
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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

  Log Message:
  -----------
  Merge branch 'tm-import' into integration/master


Compare: https://github.com/zanata/zanata-api/compare/48035cfed80d...dabf4a21b7bb