[50/50] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2017-08-05 Thread ddekany
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/a5fb3511 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a5fb3511 Dif

[50/50] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2016-06-12 Thread ddekany
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/04c64935 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/04c64935 Dif