master will be 2.6
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:43:07 +0000 (16:43 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:43:07 +0000 (16:43 +0200)
CHANGES
setup.py

diff --git a/CHANGES b/CHANGES
index cbeefa7af87acaa4240eba979dc43286b24a5a80..7e6c9066d9a1f90cd15b16aa5427b9764f5261f3 100644 (file)
--- 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)
index e50ffa94a0852d75464a4971fd8e6d7239e23b70..856ec5b76d09155e5f5e0773c37b6f38f1a6232a 100644 (file)
--- 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',