Merge remote-tracking branch 'origin/2.3-gae'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/4045daa9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4045daa9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4045daa9 Branch: refs/heads/master Commit: 4045daa9c0cb829323b0005419a0f69bf2391b43 Parents: de5367c 06557d5 Author: ddekany <[email protected]> Authored: Sun Jan 3 00:46:19 2016 +0100 Committer: ddekany <[email protected]> Committed: Sun Jan 3 00:46:19 2016 +0100 ---------------------------------------------------------------------- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4045daa9/build.xml ----------------------------------------------------------------------
