Merge branch '2.5-maintenance'

diff --cc CHANGES
index 5cab94f94f7437c601b82ffff165475247360604,e02aed5ea1d9efbb62bc8ef9864f62f29c2512de..c463e6481306a3a03e7a37e215688910d736bc77
--- 1/CHANGES
--- 2/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