Merge branch '2.5-maintenance'

Conflicts:
	CHANGES
	setup.py

diff --cc CHANGES
index c463e6481306a3a03e7a37e215688910d736bc77,2a49c6413a81f8e2b6302da0f4db481420087cf4..182f0b043c8536aaa38fb861c53661758c8cc330
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,10 -1,13 +1,17 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.6
 +-----------
 +(codename to be selected, release date to be announced)
 +
+ Version 2.5.5
+ -------------
+ (re-release of 2.5.4 with built documentation removed for filesize.
+  Released on October 18th 2010)
+ 
+ - built documentation is no longer part of release.
+ 
  Version 2.5.4
  -------------
  (bugfix release, released on October 17th 2010)