From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 18 Oct 2010 12:38:39 +0000 (+0200)
Subject: Merge branch '2.5-maintenance'
X-Git-Tag: 2.6~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64ff4fa4f5110358f0fea236c600a13dc00c7909;p=jinja2.git

Merge branch '2.5-maintenance'

Conflicts:
	CHANGES
	setup.py
---

64ff4fa4f5110358f0fea236c600a13dc00c7909
diff --cc CHANGES
index c463e64,2a49c64..182f0b0
--- a/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)