Merge commit 'refs/pull/20/head' of https://github.com/apache/incubator-freemarker into 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/cdb32f2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/cdb32f2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/cdb32f2d Branch: refs/heads/2.3-gae Commit: cdb32f2d0c5aa2bfebce9899c688d5b839fbf1e2 Parents: 20613a5 2321bd7 Author: ddekany <[email protected]> Authored: Wed Apr 12 13:38:16 2017 +0200 Committer: ddekany <[email protected]> Committed: Wed Apr 12 13:38:16 2017 +0200 ---------------------------------------------------------------------- .travis.yml | 5 +++++ build.xml | 11 +++++++++++ 2 files changed, 16 insertions(+) ----------------------------------------------------------------------
