From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 1 Sep 2013 18:37:40 +0000 (-0400)
Subject: Merge branch 'branch3.1'
X-Git-Tag: v3.2.0b1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0352fe008e9991921aa34be340a51199e8335e99;p=thirdparty%2Ftornado.git

Merge branch 'branch3.1'

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

0352fe008e9991921aa34be340a51199e8335e99
diff --cc docs/releases.rst
index 96f372e4f,e72cd4ce2..338e30de6
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v3.1.1
     releases/v3.1.0
     releases/v3.0.2
     releases/v3.0.1