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/b2578291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b2578291
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/c6209680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c6209680
Diff: