]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge branch 'branch2.4'
authorBen Darnell <ben@bendarnell.com>
Sun, 25 Nov 2012 02:54:18 +0000 (21:54 -0500)
committerBen Darnell <ben@bendarnell.com>
Sun, 25 Nov 2012 02:54:18 +0000 (21:54 -0500)
Conflicts:
setup.py
tornado/__init__.py
tornado/test/auth_test.py
website/sphinx/releases.rst

1  2 
website/sphinx/releases.rst

index 474292a1cca6074273ee74d483e8ea9bf357406a,182b4aa72b2263a0725d84396544c4a54454e9d4..421cdfcce2aa177a72bc94ec81590f780892b09c
@@@ -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