From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 24 Jul 2011 19:49:07 +0000 (+0200)
Subject: master is 2.7-dev
X-Git-Tag: 2.7~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1de008939555c0cd45ee6942a66030f9a3b3d4;p=thirdparty%2Fjinja.git

master is 2.7-dev
---

diff --git a/jinja2/__init__.py b/jinja2/__init__.py
index 0cf967d7..5b349d66 100644
--- 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 856ec5b7..41479562 100644
--- 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',