[zanata/zanata] 81d5b7: Merge branch '1.4'

[GitHub]

  Branch: refs/heads/rhbz754870
  Home:   https://github.com/zanata/zanata
  Commit: 81d5b77e671bb7ebb3e29c8d20a1bb829149d8ae
      https://github.com/zanata/zanata/commit/81d5b77e671bb7ebb3e29c8d20a1bb829149d8ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

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

Conflicts:
	client/pom.xml
	client/zanata-adapter-properties/pom.xml
	client/zanata-adapter-xliff/pom.xml
	client/zanata-client-ant-po/pom.xml
	client/zanata-client-ant-properties/pom.xml
	client/zanata-client-commands/pom.xml
	client/zanata-maven-plugin/pom.xml
	common/pom.xml
	common/zanata-adapter-po/pom.xml
	common/zanata-common-api/pom.xml
	common/zanata-common-util/pom.xml
	common/zanata-rest-client/pom.xml
	pom.xml
	server/pom.xml
	server/zanata-model/pom.xml
	server/zanata-war/pom.xml
	zanata-parent/pom.xml


  Commit: 7fbf292c7025da46da77fb15aa138d09edebb1e0
      https://github.com/zanata/zanata/commit/7fbf292c7025da46da77fb15aa138d09edebb1e0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java

  Log Message:
  -----------
  rhbz754870 Add pull option -Dzanata.createSkeletons to create skeletons for untranslated messages/files


Compare: https://github.com/zanata/zanata/compare/81d5b77^...7fbf292