From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 17 Oct 2010 14:48:55 +0000 (+0200)
Subject: Merge branch '2.5-maintenance'
X-Git-Tag: 2.6~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb09fb255f234f94d7bdd32ff011248de275af9a;p=jinja2.git

Merge branch '2.5-maintenance'
---

bb09fb255f234f94d7bdd32ff011248de275af9a
diff --cc CHANGES
index 5cab94f,e02aed5..c463e64
--- a/CHANGES
+++ b/CHANGES
@@@ -1,13 -1,9 +1,13 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.6
 +-----------
 +(codename to be selected, release date to be announced)
 +
  Version 2.5.4
  -------------
- (bugfix release, release date to be announced)
+ (bugfix release, released on October 17th 2010)
  
  - Fixed extensions not loading properly with overlays.
  - Work around a bug in cpython for the debugger that causes segfaults