[zanata-commits] [zanata/zanata] 37f140: Merge branch '1.4'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 37f140cd0c279f8c4e6669b89d5906d5be7d1ab2
      https://github.com/zanata/zanata/commit/37f140cd0c279f8c4e6669b89d5906d5be7d1ab2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-09-19 (Mon, 19 Sep 2011)

  Changed paths:
    M client/zanata-maven-plugin/demo-props/pom.xml
  M client/zanata-maven-plugin/demo-publican/pom.xml
  M client/zanata-maven-plugin/demo-xliff/pom.xml
  M client/zanata-maven-plugin/demo-xml/pom.xml
  M client/zanata-maven-plugin/sample-scripts/pom.xml
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/ZanataInit.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
  R server/zanata-war/src/main/resources-dev/import.sql
  R server/zanata-war/src/main/resources-dev/readme.txt
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  A server/zanata-war/src/test/resources/import.sql
  M zanata-parent/pom.xml

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

Conflicts:
	server/zanata-model/src/test/resources/META-INF/persistence.xml
	server/zanata-war/src/main/java/org/zanata/ZanataInit.java