From: Ben Darnell <ben@bendarnell.com>
Date: Fri, 7 Oct 2011 08:07:58 +0000 (-0700)
Subject: Bump version number in the master branch
X-Git-Tag: v2.2.0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dd03c06f656804220fd3e7226a6c560160b34fe;p=thirdparty%2Ftornado.git

Bump version number in the master branch
---

diff --git a/setup.py b/setup.py
index 8ef49bfb5..9987bb166 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ if "linux" in sys.platform.lower() and not python_26:
     extensions.append(distutils.core.Extension(
         "tornado.epoll", ["tornado/epoll.c"]))
 
-version = "2.1.1"
+version = "2.1.1git"
 
 if major >= 3:
     import setuptools  # setuptools is required for use_2to3
diff --git a/tornado/__init__.py b/tornado/__init__.py
index c975de776..ea48b0f02 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,5 @@
 
 """The Tornado web server and tools."""
 
-version = "2.1.1"
+version = "2.1.1git"
 version_info = (2, 1, 1)