From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 3 Jun 2013 01:16:48 +0000 (-0400)
Subject: Merge branch 'branch3.0'
X-Git-Tag: v3.1.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8fae5cfee26459479f18d003fcf516761931d9a;p=thirdparty%2Ftornado.git

Merge branch 'branch3.0'

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

e8fae5cfee26459479f18d003fcf516761931d9a
diff --cc docs/releases.rst
index b80432604,782c20afb..c66816e84
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v3.0.2
     releases/v3.0.1
     releases/v3.0.0
     releases/v2.4.1