From 661e9c7ad2820e881c93474f2fbcbe2661fd1970 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 28 Jun 2011 08:09:35 +0200
Subject: [PATCH] updated CHANGELOG

---
 CHANGELOG |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9fdf744..25ca692 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+* 1.1.0 (2011-06-28)
+
+Changes:
+
+ * fixed json_encode filter
+
 * 1.1.0-RC3 (2011-06-24)
 
 Changes:
-- 
1.7.2.5