merged branch hason/macros (PR #1139)

This PR was merged into the master branch.

Discussion
----------

Improved macros

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #861, #867, #929, #1052
| License       | MIT
| Doc        | yes

* Fixed fatal error for unknown macro
* Added support for named arguments for macros
* Added support for directly call macros defined in the same template

Commits
-------

3004ba1 Added support for directly call macros defined in the same template
63615a6 Added support for named arguments for macros
09fedb8 Fixed fatal error for unknown macro
9e96837 Refactored parsing of macros

diff --cc CHANGELOG
index d321f11,9db9382..f50f016
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,12 -1,9 +1,14 @@@
 -* 1.13.2 (2013-XX-XX)
 +* 1.14.0 (2013-XX-XX)
  
-  * n/a
+  * in the template can be directly called macros defined in the same template
+  * added support for named arguments for macros
+  * fixed fatal error that should be an exception when macro does not exist in template
  
 +* 1.13.2 (2013-08-03)
 +
 + * fixed the error line number for an error occurs in and embedded template
 + * fixed crashes of the C extension on some edge cases
 +
  * 1.13.1 (2013-06-06)
  
   * added the possibility to ignore the filesystem constructor argument in Twig_Loader_Filesystem

diff --cc test/Twig/Tests/TemplateTest.php
Simple merge