[zanata/zanata] 3646cc: merge branch 1.4 into master

[noreply at github.com]

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

  Commit: 3646cc5dc5cf0183ae00a531d559ebdf2125c4be
      https://github.com/zanata/zanata/commit/3646cc5dc5cf0183ae00a531d559ebdf2125c4be
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  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/PropReaderTests.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.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/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  merge branch 1.4 into master

	conflicted: PropWriter, PropReaderTests