From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 12 Aug 2014 13:17:01 +0000 (-0400)
Subject: Merge branch 'branch4.0'
X-Git-Tag: v4.1.0b1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1fc1f4838c1c16e7b134255c6e3ce68320274e4;p=thirdparty%2Ftornado.git

Merge branch 'branch4.0'

Conflicts:
	docs/releases.rst
	setup.py
	tornado/__init__.py
---

b1fc1f4838c1c16e7b134255c6e3ce68320274e4
diff --cc docs/releases.rst
index 4dba891ac,d239c3ecc..30d1170dd
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v4.0.1
     releases/v4.0.0
     releases/v3.2.2
     releases/v3.2.1