From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 25 Nov 2012 02:54:18 +0000 (-0500)
Subject: Merge branch 'branch2.4'
X-Git-Tag: v3.0.0~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=307c523735dd12022177e5205c806ecb8c5ea09f;p=thirdparty%2Ftornado.git

Merge branch 'branch2.4'

Conflicts:
	setup.py
	tornado/__init__.py
	tornado/test/auth_test.py
	website/sphinx/releases.rst
---

307c523735dd12022177e5205c806ecb8c5ea09f
diff --cc website/sphinx/releases.rst
index 474292a1c,182b4aa72..421cdfcce
--- a/website/sphinx/releases.rst
+++ b/website/sphinx/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v2.4.1
     releases/v2.4.0
     releases/v2.3.0
     releases/v2.2.1