From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 2 Oct 2013 19:48:06 +0000 (+0200)
Subject: Revert "updated CHANGELOG"
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=bf40fa3d795ace682b5100b07fffd6f7275cdb8b;p=web%2Fkonrad%2Ftwig.git

Revert "updated CHANGELOG"

This reverts commit 7ffca6c735bec4d37186ed10162134c978160f17.

Conflicts:
	CHANGELOG
---

diff --git a/CHANGELOG b/CHANGELOG
index 2994052..120f43a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,9 +9,9 @@
  * fixed the filesystem loader cache when a template name exists in several namespaces
  * fixed template_from_string when the template includes or extends other ones
  * fixed a crash of the C extension on an edge case
- * added support for calling macros defined in a template without importing them first
+ * in the template can be directly called macros defined in the same template
  * added support for named arguments for macros
- * replaced a PHP fatal error with an exception when  a macro does not exist
+ * fixed fatal error that should be an exception when macro does not exist in template
 
 * 1.13.2 (2013-08-03)