tree 2ab214968124793d13309b2ab708a661966d5fc4
parent a03a1473b65d9819674b285a0538fed824f37478
parent c2c64f790788776e7ee78d96b3b0bf863d70476e
author ddekany <ddekany@apache.org> 1531422859 +0200
committer ddekany <ddekany@apache.org> 1531422859 +0200

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