tree 2bcae4d59faa9e81589f94a2ae138a33d746c08c
parent 396736f41829dab17fac18a2f1e3593921dcfd5d
parent 66161f389fcd69ace42c7c97212493ee72b43679
author ddekany <ddekany@apache.org> 1461180432 +0200
committer ddekany <ddekany@apache.org> 1461180911 +0200

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

Added Apache Marmotta to the powered-by page

Closes #1