From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 8 Feb 2013 16:34:13 +0000 (+0100)
Subject: merged branch lyrixx/patch-5 (PR #989)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=a357971d49bef88b9b8c766aa18bf19c2edaeb0a;p=web%2Fkonrad%2Ftwig.git

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
---

a357971d49bef88b9b8c766aa18bf19c2edaeb0a