From dab8d90755a7c1a54cd20be5098f5b5bf3346d9b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 15 Mar 2014 11:50:05 +0100
Subject: [PATCH] updated CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index a20fabb..613e989 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 * 1.15.2 (2014-XX-XX)
 
- * n/a
+ * fixed recursively calling blocks in templates with inheritance
 
 * 1.15.1 (2014-02-13)
 
-- 
1.7.2.5