[zanata/zanata] 80280a: Merge branch 'rhbz788294'

Sun Mar 25 22:43:17 UTC 2012

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

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilter.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  M server/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
  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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/InsertStringInEditorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/InsertStringInEditorHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryCopyEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryCopyHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTypeRenderer.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/ClickableImageResourceCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/CopyButtonColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsAction.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransMemoryDetailsAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetails.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

  Log Message:
  -----------
  Merge branch 'rhbz788294'

  Commit: 7228c173abbe662e37dfb14dda1c7a69aaacb74a
      https://github.com/zanata/zanata/commit/7228c173abbe662e37dfb14dda1c7a69aaacb74a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

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

  Commit: d5ecaf7ef2d8d36084bafeff97a01f8af439305f
      https://github.com/zanata/zanata/commit/d5ecaf7ef2d8d36084bafeff97a01f8af439305f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  suppress warnings for TM presenter test

  Commit: 74b6981d8b916c62e07387caa5ccaf31fa424a58
      https://github.com/zanata/zanata/commit/74b6981d8b916c62e07387caa5ccaf31fa424a58
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Merge commit 'd5ecaf7ef2d8d36084bafeff97a01f8af439305f' into HEAD

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

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  First working version of new Project version page.

  Commit: e41f42cea90ad3113998adb1e8967791e7c98c99
      https://github.com/zanata/zanata/commit/e41f42cea90ad3113998adb1e8967791e7c98c99
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Merge commits that were added to master instead of integration

  Commit: 2c24b4e61c9ed3f437df258ae1992f725266e48f
      https://github.com/zanata/zanata/commit/2c24b4e61c9ed3f437df258ae1992f725266e48f
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Log Message:
  -----------
  Merge commit 'e41f42cea90ad3113998adb1e8967791e7c98c99' into HEAD

  Commit: c814b6cefc90fa461428b4259464aa2884effb89
      https://github.com/zanata/zanata/commit/c814b6cefc90fa461428b4259464aa2884effb89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java

  Log Message:
  -----------
  Move @SuppressWarnings annotation to make PMD happy

  Commit: ce532e4d50797956fd8c46e624c49e0de4258cb9
      https://github.com/zanata/zanata/commit/ce532e4d50797956fd8c46e624c49e0de4258cb9
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java

  Log Message:
  -----------
  Merge commit 'c814b6cefc90fa461428b4259464aa2884effb89' into HEAD

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

  Changed paths:
    R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Style changes to the new Iteration page.

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

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch 'rhbz800869' into integration

  Commit: 262ed49107f0e677868487bdcd4419007f3611c5
      https://github.com/zanata/zanata/commit/262ed49107f0e677868487bdcd4419007f3611c5
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge commit '0b8fc2b24a52ad438ffb46c430419a92dc731524' into HEAD

  Commit: 2a589bfec801c51e85ccb84c63d5ede672b9a486
      https://github.com/zanata/zanata/commit/2a589bfec801c51e85ccb84c63d5ede672b9a486
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  escape java variable example so it will display properly in ui

  Commit: faff69f040e6b233fe83a807b7397dd7dc4d4829
      https://github.com/zanata/zanata/commit/faff69f040e6b233fe83a807b7397dd7dc4d4829
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  Merge branch 'validation' into integration

  Commit: 60cac5a83f0f8b1a6847205f7378cc3b3824b9c6
      https://github.com/zanata/zanata/commit/60cac5a83f0f8b1a6847205f7378cc3b3824b9c6
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  Merge commit 'faff69f040e6b233fe83a807b7397dd7dc4d4829' into HEAD

  Commit: 9c9b9745ebf8177045ea409303f3746a877f2c85
      https://github.com/zanata/zanata/commit/9c9b9745ebf8177045ea409303f3746a877f2c85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

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

  Commit: b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
      https://github.com/zanata/zanata/commit/b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  rhbz727789 - Fix bug preventing non-admin users from creating projects.

Refactor a security rule causing the issue.

  Commit: a650875363e3ee94dfb9ecba95989b383b499c1f
      https://github.com/zanata/zanata/commit/a650875363e3ee94dfb9ecba95989b383b499c1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Apply css into iteration page, rename iteration.xhtml to view.html

  Commit: 86cf39fbc20bd3d108628e9395a217fbdb983d45
      https://github.com/zanata/zanata/commit/86cf39fbc20bd3d108628e9395a217fbdb983d45
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

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

  Commit: 27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
      https://github.com/zanata/zanata/commit/27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 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:
  -----------
  Upgrade to Liquibase 2.0

  Commit: b2b673541cec43948613d9827e7eb2894162978e
      https://github.com/zanata/zanata/commit/b2b673541cec43948613d9827e7eb2894162978e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 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 'liquibase-2.0' into integration

  Commit: f3e347c564d92fbfbe291ce6bbddc253774671e4
      https://github.com/zanata/zanata/commit/f3e347c564d92fbfbe291ce6bbddc253774671e4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java

  Log Message:
  -----------
  rhbz727789 - Implement non-admin project creation in 1.5 branch

This revision is a cherry-pick of the following commits:
e8afa8a65f47aceac35ce2ebd8cc97517badadf0
ad01b3f915e4f776cd6604f20cce3a49bf3489ee
b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
a5153d9001e120d7d3fcd15bec4eca7499a7b06a

  Commit: ac4253135252713069ecb2c9fefe174ef9d26d3c
      https://github.com/zanata/zanata/commit/ac4253135252713069ecb2c9fefe174ef9d26d3c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

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

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HPerson.java

Compare: https://github.com/zanata/zanata/compare/39d4f75...ac42531