From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 23 Nov 2008 14:45:13 +0000 (+0100)
Subject: tip is now 2.2-dev
X-Git-Tag: 2.1.1~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e58d43ae35f09b7cd7280311000d23e330e70c4;p=jinja2.git

tip is now 2.2-dev

--HG--
branch : trunk
---

diff --git a/CHANGES b/CHANGES
index bcf38d2..3870358 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Jinja2 Changelog
-===============
+================
+
+Version 2.2
+-----------
+(codename to be selected, release date yet unknown)
 
 Version 2.1
 -----------
diff --git a/setup.py b/setup.py
index bc18c32..439ce9f 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.1'
+VERSION = '2.2'
 
 
 data_files = []