[zanata/zanata] 63a664: Implement fix for https://bugzilla.redhat.com/show...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 63a66439820b95ea886373ec1785d6761a23e41e
      https://github.com/zanata/zanata/commit/63a66439820b95ea886373ec1785d6761a23e41e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    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/TableEditorView.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/shared/model/TransUnit.java

  Log Message:
  -----------
  Implement fix for https://bugzilla.redhat.com/show_bug.cgi?id=760431#c8


  Commit: ee7a2a32ceb3662ea945af60f347377575f4134a
      https://github.com/zanata/zanata/commit/ee7a2a32ceb3662ea945af60f347377575f4134a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

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


  Commit: e71cf0ef63f409eb553126d969e168632c7999a6
      https://github.com/zanata/zanata/commit/e71cf0ef63f409eb553126d969e168632c7999a6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

  Log Message:
  -----------
  Merge branch '1.4' into rhbz760431

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


Compare: https://github.com/zanata/zanata/compare/ab5fc4f...e71cf0e