[zanata/zanata] 41d0b0: Merge branch 'rhbz803572' of github.com:zanata/zan...

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 41d0b0c4f45314b1641dbe52046a34c654ce4333
      https://github.com/zanata/zanata/commit/41d0b0c4f45314b1641dbe52046a34c654ce4333
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

  Log Message:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572

Conflicts:
	server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java


  Commit: 456fb45bf728a0718322e1ce48a9194a2cb93661
      https://github.com/zanata/zanata/commit/456fb45bf728a0718322e1ce48a9194a2cb93661
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

  Log Message:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572


Compare: https://github.com/zanata/zanata/compare/e08477a...456fb45