Merge branch 'branch3.0'

author Ben Darnell <ben@bendarnell.com>

Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)

committer Ben Darnell <ben@bendarnell.com>

Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
author Ben Darnell <ben@bendarnell.com>
Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
committer Ben Darnell <ben@bendarnell.com>
Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
diff --cc docs/releases.rst

index b8043260410f57dc974edaeee444ae55c3c8f9d1,782c20afba161230057b064aad9272148173661d..c66816e84a2b4a2298f8b434ea9767667e802b0a
--- 1/docs/releases.rst
--- 2/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
diff --cc tornado/auth.py
Simple merge
author	Ben Darnell <ben@bendarnell.com>
	Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
committer	Ben Darnell <ben@bendarnell.com>
	Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
		1	2
docs/releases.rst	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/auth.py	patch \|	diff1 \|	diff2 \|	blob \| history