[zanata/zanata] 48e76b: Merge branch 'rhbz803572' of github.com:zanata/zan...

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 48e76b451016de76e3c9d739e1e1dd4f349c934f
      https://github.com/zanata/zanata/commit/48e76b451016de76e3c9d739e1e1dd4f349c934f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java


  Commit: 35235d58003bba770bc645c192dd8b93f63a4ff9
      https://github.com/zanata/zanata/commit/35235d58003bba770bc645c192dd8b93f63a4ff9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

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


Compare: https://github.com/zanata/zanata/compare/8c72938...35235d5