tree aae8e2af58cc85bddb84881d60cdf80f33c07574
parent 3df6d25254eea007881368556a332907b3075682
parent 98d6eb9ed23b33a36178c44eaba6da8a11956baf
author ddekany <ddekany@apache.org> 1483601065 +0100
committer ddekany <ddekany@apache.org> 1483601065 +0100

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