merged branch jezhalford/patch-1 (PR #1067)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 24 Apr 2013 14:31:03 +0000 (16:31 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 24 Apr 2013 14:31:03 +0000 (16:31 +0200)
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


Trivial merge