From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 27 Mar 2011 19:17:16 +0000 (+0200)
Subject: fixed CHANGELOG
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=2f106a80cc13b4260074e573fa017a770fe20350;p=konrad%2Ftwig.git

fixed CHANGELOG
---

diff --git a/CHANGELOG b/CHANGELOG
index 879d297..783d9df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,15 @@
-* 1.0.0-RC2 (2011-02-21)
+* 1.0.0 (2011-03-27)
 
 Changes:
 
  * fixed output when using mbstring
  * fixed duplicate call of methods when using the sandbox
  * made the charset configurable for the escape filter
+
+* 1.0.0-RC2 (2011-02-21)
+
+Changes:
+
  * changed the way {% set %} works when capturing (the content is now marked as safe)
  * added support for macro name in the endmacro tag
  * make Twig_Error compatible with PHP 5.3.0 >