]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge branch 'branch3.0'
authorBen Darnell <ben@bendarnell.com>
Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
committerBen Darnell <ben@bendarnell.com>
Mon, 3 Jun 2013 01:16:48 +0000 (21:16 -0400)
commite8fae5cfee26459479f18d003fcf516761931d9a
tree62363491403a31d7d4615f48ede39b8035bc38c5
parent03578d96f21a8ebad60d07b3a7b2c4cac5c77384
parent1a3088b58d5160c4befbc5119cd5459e0c24a5a1
Merge branch 'branch3.0'

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