summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:48:55 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:48:55 +0200
commitbb09fb255f234f94d7bdd32ff011248de275af9a (patch)
tree5c902a435fc5951eb53c1869db0373992756e2ed /CHANGES
parentcff8e1cd5d325d175449476e1fad433e24ff6479 (diff)
parent75cd04fd9876d46007ddcfaab77f922290ed1eca (diff)
downloadjinja2-bb09fb255f234f94d7bdd32ff011248de275af9a.tar.gz
Merge branch '2.5-maintenance'
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 5cab94f..c463e64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ Version 2.6
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