From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 17 Aug 2010 10:39:40 +0000 (+0200)
Subject: tip is 2.6
X-Git-Tag: 2.5.3~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd0039c9aab9c3876535d9aca543bce7fa462924;p=jinja2.git

tip is 2.6

--HG--
branch : trunk
---

diff --git a/CHANGES b/CHANGES
index 099c7c3..5ad58e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@ Jinja2 Changelog
 
 Version 2.5.1
 -------------
-(bugfix release, release date to be announced)
+(bugfix release, released on August 17th 2010)
 
 - StopIteration exceptions raised by functions called from templates
   are now intercepted and converted to undefineds.  This solves a
diff --git a/setup.py b/setup.py
index f3b80b6..cf915cc 100644
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ if sys.version_info >= (3, 0):
 
 setup(
     name='Jinja2',
-    version='2.5.1',
+    version='2.6',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',