From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 24 Jul 2011 19:46:07 +0000 (+0200)
Subject: Prepairing for a 2.6 release
X-Git-Tag: 2.6~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=397b42e1688d923ca693f82416880d875c0e17e2;p=jinja2.git

Prepairing for a 2.6 release
---

diff --git a/CHANGES b/CHANGES
index 9fdfba2..ae07828 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@ Jinja2 Changelog
 
 Version 2.6
 -----------
-(codename to be selected, release date to be announced)
+(codename Convolution, released on July 24th 2011)
 
 - internal attributes now raise an internal attribute error now instead
   of returning an undefined.  This fixes problems when passing undefined