Merge branch '2.5-maintenance'

Conflicts:
	CHANGES
	setup.py

1 files changed, 7 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index c463e64..182f0b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,13 @@ 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)