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)
commitddde9302f8115ab15e96ac7a5f784eb6aa42ec2f
tree3cf2aa7bd8d80de295342689ba848384d9db350f
parent80fd11cbbe68fada461626e7b2d67bda0ef8ecfa
parentc155932490453980e18cfe0ac50474ac6fd64c8b
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