From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 17 Jul 2008 21:34:44 +0000 (+0200)
Subject: tip is now 2.1-dev
X-Git-Tag: 2.1~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=237cdde5e7a91ce5f9880fa878682cf609dc37ba;p=jinja2.git

tip is now 2.1-dev

--HG--
branch : trunk
---

diff --git a/CHANGES b/CHANGES
index 609bcf2..02f12fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Jinja2 Changelog
 ===============
 
+Version 2.1
+-----------
+(codename to be selected, release date yet unknown)
+
 Version 2.0
 -----------
 (codename jinjavitus, released on July 17th 2008)
diff --git a/setup.py b/setup.py
index e94b92f..7062050 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ from distutils.errors import CCompilerError, DistutilsPlatformError
 
 #: don't change the variable and assignment.  the fabfile parses this
 #: file to get the version for deployment from it.
-VERSION = '2.0'
+VERSION = '2.1'
 
 
 data_files = []