From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 26 Jun 2011 01:25:37 +0000 (-0700)
Subject: Bump version number for the master branch
X-Git-Tag: v2.1.0~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fde3f5f17ef9a75960690c8ffbf583678932f61;p=thirdparty%2Ftornado.git

Bump version number for the master branch
---

diff --git a/setup.py b/setup.py
index 77c9d23fe..760898226 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.0"
+version = "2.0git"
 
 if major >= 3:
     import setuptools  # setuptools is required for use_2to3
diff --git a/tornado/__init__.py b/tornado/__init__.py
index 9222a28c3..bbe71e69f 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,5 @@
 
 """The Tornado web server and tools."""
 
-version = "2.0"
+version = "2.0git"
 version_info = (2, 0, 0)