tree c83b1af25dfa74e8fb44a55f2fa55967f0c33ec6
parent dc80afe382186aa13e387aa95a74f9c1099bd975
parent 1f8800cce2b46805c72e00fb959d829c3641ccd8
author edendramis <evangeliad@gmail.com> 1435813518 -0700
committer edendramis <evangeliad@gmail.com> 1435813518 -0700

Merge branch 'master' of github.com:freemarker/docgen