From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 17 Oct 2010 14:43:07 +0000 (+0200)
Subject: master will be 2.6
X-Git-Tag: 2.6~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44e1f567a621ecd697373c6c708e90c3171ec2b6;p=thirdparty%2Fjinja.git

master will be 2.6
---

diff --git a/CHANGES b/CHANGES
index cbeefa7a..7e6c9066 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Jinja2 Changelog
 ================
 
+Version 2.6
+-----------
+(codename to be selected, release date to be announced)
+
 Version 2.5.4
 -------------
 (bugfix release, release date to be announced)
diff --git a/setup.py b/setup.py
index e50ffa94..856ec5b7 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ else:
 
 setup(
     name='Jinja2',
-    version='2.5.4',
+    version='2.6',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',