tree ab8749b499c9436ad698ae6814a3ea31c2fe7416
parent 43d0658410b65f489597d6950da0abe3970a7ea0
parent b2ff8152202accd51d0760b20b5773deb6d44784
author ddekany <ddekany@apache.org> 1528649308 +0200
committer ddekany <ddekany@apache.org> 1528649308 +0200

Merge commit 'refs/pull/46/head' of https://github.com/apache/freemarker into 2.3-gae