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

2018-03-10 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/5bfa9ac4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5bfa9ac4 Dif

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

2017-10-03 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/1ff236c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1ff236c9 Dif

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

2017-03-26 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/bfb836b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bfb836b2 Dif

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

2017-03-15 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/a3fb59d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a3fb59d6 Dif

[2/2] 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/716b1f1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/716b1f1a Dif

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

2016-01-03 Thread ddekany
Merge remote-tracking branch 'origin/2.3-gae' into 2.3 Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b1980af5 Tree: http://git-wip-us.apache.org/repos/asf/incubato

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

2016-01-02 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/81e1716a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/81e1716a Dif

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

2015-09-25 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/84927d91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/84927d91 Dif

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

2015-09-25 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/dfc4f0aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dfc4f0aa Dif

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

2015-09-09 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/b6d84a08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b6d84a08 Dif

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

2015-09-08 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/dfe0c097 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dfe0c097 Dif