master is 2.7-dev

diff --git a/jinja2/__init__.py b/jinja2/__init__.py
index 0cf967d7b9dbb1e3994077d930e45d2c9cb4dc2c..5b349d6678e7699e87ed4c689edf35faef843c52 100644 (file)
--- a/jinja2/__init__.py
+++ b/jinja2/__init__.py
@@ -27,7 +27,7 @@
     :license: BSD, see LICENSE for more details.
 """
 __docformat__ = 'restructuredtext en'
-__version__ = '2.6'
+__version__ = '2.7-dev'
 
 # high level interface
 from jinja2.environment import Environment, Template

diff --git a/setup.py b/setup.py
index 856ec5b76d09155e5f5e0773c37b6f38f1a6232a..414795620a176ddcbe342103ebc7516dce8c5566 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ else:
 
 setup(
     name='Jinja2',
-    version='2.6',
+    version='2.7-dev',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',