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/eed6d941 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/eed6d941 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/eed6d941 Branch: refs/heads/master Commit: eed6d94194f9070a686dd4fc4c3adeef370083fe Parents: aa716c5 0256df5 Author: ddekany <[email protected]> Authored: Fri Oct 16 21:27:11 2015 +0200 Committer: ddekany <[email protected]> Committed: Fri Oct 16 21:27:11 2015 +0200 ---------------------------------------------------------------------- src/test/java/freemarker/cache/FileTemplateLoaderTest.java | 2 +- src/test/java/freemarker/core/ASTTest.java | 7 ++++++- src/test/java/freemarker/test/utility/FileTestCase.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
