Merge commit 'refs/pull/2/head' of https://github.com/apache/incubator-freemarker-site
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/cbafd5e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/cbafd5e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/cbafd5e2 Branch: refs/heads/master Commit: cbafd5e2027a647c8d9e90ae0597428f1703cd61 Parents: 3df6d25 98d6eb9 Author: ddekany <[email protected]> Authored: Thu Jan 5 08:24:25 2017 +0100 Committer: ddekany <[email protected]> Committed: Thu Jan 5 08:24:25 2017 +0100 ---------------------------------------------------------------------- README | 2 +- src/main/docgen/book.xml | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
