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/6442fd76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6442fd76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6442fd76 Branch: refs/heads/2.3 Commit: 6442fd7650b6ce84b1ddf70536c230e9942e1876 Parents: 9c8f7ab 5f821f1 Author: ddekany <ddek...@apache.org> Authored: Sat Mar 10 08:26:22 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sat Mar 10 08:26:22 2018 +0100 ---------------------------------------------------------------------- .../java/freemarker/core/BuiltinVariable.java | 17 +- src/main/java/freemarker/core/Environment.java | 6 +- src/main/java/freemarker/core/Macro.java | 4 +- src/main/java/freemarker/core/MethodCall.java | 2 +- src/manual/en_US/book.xml | 41 +++-- .../freemarker/core/CallerTemplateNameTest.java | 163 +++++++++++++++++++ .../core/MacroCallerTemplateNameTest.java | 157 ------------------ 7 files changed, 205 insertions(+), 185 deletions(-) ----------------------------------------------------------------------
