[zanata/zanata] 62048d: Merge branch '1.4'

[GitHub]

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

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/AppPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java