Merge commit 'refs/pull/49/head' of https://github.com/apache/freemarker into 2.3-gae
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/ed2ab64e Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/ed2ab64e Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/ed2ab64e Branch: refs/heads/2.3-gae Commit: ed2ab64ef1831908b1c30c7387a20d18d0dd8ffc Parents: f2602ce fec7bb7 Author: ddekany <ddek...@apache.org> Authored: Thu Sep 6 08:25:10 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Thu Sep 6 08:25:10 2018 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/template/package.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------