From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 24 Apr 2013 14:31:03 +0000 (+0200)
Subject: merged branch jezhalford/patch-1 (PR #1067)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=ddde9302f8115ab15e96ac7a5f784eb6aa42ec2f;p=web%2Fkonrad%2Ftwig.git

merged branch jezhalford/patch-1 (PR #1067)

This PR was merged into the master branch.

Discussion
----------

Made macro documentation clearer

Previous wording implied (to me at least) that macros *are* PHP functions.

Commits
-------

c155932 Made macro doc clearer
---

ddde9302f8115ab15e96ac7a5f784eb6aa42ec2f