]> git.ipfire.org Git - thirdparty/tornado.git/commit
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)
commit307c523735dd12022177e5205c806ecb8c5ea09f
tree4773da5fd79448a8006cb7a6bcf8767f5312a58b
parent080f285b9d9347d2c8d1a67118259ee02d3acd2b
parent169ac4ef4983058eadc72d7dc4860e8acb2c8109
Merge branch 'branch2.4'

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