]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge branch 'branch2.2'
authorBen Darnell <ben@bendarnell.com>
Tue, 24 Apr 2012 05:34:42 +0000 (22:34 -0700)
committerBen Darnell <ben@bendarnell.com>
Tue, 24 Apr 2012 05:34:42 +0000 (22:34 -0700)
commit3df46ee312baab2e867ba83fb5b413b164e7cea8
treeba05ba2f756a8268ffe38cebaf3c8b56e0c53e66
parent5ae39bc6d171e7ca2abe8d3ddfc6304397664978
parent235cb17a0ae1b23d4eee592f358bf84707d89edc
Merge branch 'branch2.2'

Conflicts:
setup.py
tornado/__init__.py
tornado/test/web_test.py
tox.ini
website/sphinx/releases.rst
tornado/test/web_test.py
tornado/web.py
tox.ini
website/sphinx/releases.rst