From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 9 Feb 2011 06:53:59 +0000 (-0800)
Subject: Merge commit 'v1.1.1'
X-Git-Tag: v1.2.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4170d351d76aa3541a0506066cf22020ad59cb09;p=thirdparty%2Ftornado.git

Merge commit 'v1.1.1'

Conflicts:
	setup.py
---

4170d351d76aa3541a0506066cf22020ad59cb09
diff --cc setup.py
index 5645ff3fb,59e469023..ebff63749
--- a/setup.py
+++ b/setup.py
@@@ -31,15 -31,10 +31,15 @@@ if "linux" in sys.platform.lower() and 
      extensions.append(distutils.core.Extension(
          "tornado.epoll", ["tornado/epoll.c"]))
  
- version = "1.1"
++version = "1.1.1"
 +
  distutils.core.setup(
      name="tornado",
 -    version="1.1.1",
 -    packages = ["tornado"],
 +    version=version,
 +    packages = ["tornado", "tornado.test"],
 +    package_data = {
 +        "tornado.test": ["README", "test.crt", "test.key"],
 +        },
      ext_modules = extensions,
      author="Facebook",
      author_email="python-tornado@googlegroups.com",