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/9459a40c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9459a40c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9459a40c Branch: refs/heads/2.3 Commit: 9459a40cb5a248c395eae1dc041ae61cc0873971 Parents: a86146b 17c3d4e Author: ddekany <ddek...@apache.org> Authored: Sat Sep 30 12:45:37 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sat Sep 30 12:45:37 2017 +0200 ---------------------------------------------------------------------- .../freemarker/template/SimpleCollection.java | 21 +++++++++-- src/manual/en_US/book.xml | 38 ++++++++++---------- 2 files changed, 37 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
