[zanata/zanata] bbde0b: Merge branch 'master' into rhbz803572

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: bbde0b3986efa5e58fe9592d0ea9c96c91ada9c9
      https://github.com/zanata/zanata/commit/bbde0b3986efa5e58fe9592d0ea9c96c91ada9c9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz803572

Conflicts:
	server/zanata-war/pom.xml


  Commit: 5aafeaf2d1f056e00045d2cff506160ccf087ef0
      https://github.com/zanata/zanata/commit/5aafeaf2d1f056e00045d2cff506160ccf087ef0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-21 (Wed, 21 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/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.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/ui/Editor.java

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


Compare: https://github.com/zanata/zanata/compare/0f14cce...5aafeaf