Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dd7a2aa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dd7a2aa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dd7a2aa3 Branch: refs/heads/2.3 Commit: dd7a2aa3fe443ee0e6b4f9584ae0fe8581fef6e8 Parents: e6b61c6 32b7be4 Author: ddekany <[email protected]> Authored: Fri Jul 1 20:41:14 2016 +0200 Committer: ddekany <[email protected]> Committed: Fri Jul 1 20:41:14 2016 +0200 ---------------------------------------------------------------------- DISCLAIMER | 16 ++++---- NOTICE | 16 ++++---- src/dist/bin/NOTICE | 10 ++--- src/dist/bin/documentation/index.html | 2 +- src/dist/jar/META-INF/NOTICE | 11 +++--- src/main/java/freemarker/core/CommandLine.java | 10 +---- src/manual/en_US/book.xml | 41 +++++++++++---------- 7 files changed, 51 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
