tree 6062917e76f5af91b440d35b4508dd8756dba110
parent 4bf3262225a476da537cbb997e3bd991f4aad799
parent 60f6243b3716e1a543ebbc1eb4e9d9fa12c3cda7
author ddekany <ddekany@apache.org> 1539115788 +0200
committer ddekany <ddekany@apache.org> 1539115788 +0200

Merge commit 'refs/pull/2/head' of https://github.com/apache/freemarker-generator