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/870b4282 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/870b4282 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/870b4282 Branch: refs/heads/2.3 Commit: 870b4282511ea4339fad268a3d7e20eea8ce6154 Parents: 44201a6 6dea2fa Author: ddekany <[email protected]> Authored: Wed Jan 4 15:03:32 2017 +0100 Committer: ddekany <[email protected]> Committed: Wed Jan 4 15:03:32 2017 +0100 ---------------------------------------------------------------------- .gitignore | 1 + README | 4 ++-- build.xml | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/870b4282/build.xml ----------------------------------------------------------------------
