Converted the README from plain txt to markdown, and added the build status 
from Travis

Merge commit 'refs/pull/21/head' of 
https://github.com/apache/incubator-freemarker into 2.3-gae


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fef04d8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fef04d8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fef04d8c

Branch: refs/heads/2.3
Commit: fef04d8cd64966face55efb1b4cb1e4748a798c1
Parents: 93dea88 f871237
Author: ddekany <ddek...@apache.org>
Authored: Thu Apr 13 14:34:04 2017 +0200
Committer: ddekany <ddek...@apache.org>
Committed: Thu Apr 13 14:41:32 2017 +0200

----------------------------------------------------------------------
 README    | 237 ----------------------------------------------------
 README.md | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 build.xml |  10 +--
 3 files changed, 260 insertions(+), 243 deletions(-)
----------------------------------------------------------------------


Reply via email to