merged branch lyrixx/patch-5 (PR #989)
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 8 Feb 2013 16:34:13 +0000 (17:34 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 8 Feb 2013 16:34:13 +0000 (17:34 +0100)
commita357971d49bef88b9b8c766aa18bf19c2edaeb0a
tree1e4fc1ec321ad1ef59b49952e87e79eb740392fa
parentc6445fb5cd6823f7bd65108a717064957b6eafd5
parente2a068d49bda16ee79d958ad40eea168168bcc0c
merged branch lyrixx/patch-5 (PR #989)

This PR was merged into the master branch.

Commits
-------

e2a068d [Doc] Updated template_from_string to use include function

Discussion
----------

[Doc] Updated template_from_string to use include function

instead of include tag