]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge branch 'branch4.0'
authorBen Darnell <ben@bendarnell.com>
Mon, 15 Sep 2014 02:02:27 +0000 (22:02 -0400)
committerBen Darnell <ben@bendarnell.com>
Mon, 15 Sep 2014 02:02:27 +0000 (22:02 -0400)
commitca2cf40cb4db270aaf9b07f3ebed8dbd4b770aef
treed83a089be31ab7e1e5d9c0de17cd06bc05c0e7eb
parent6729952c86b4e3980f577efb83a9b12e279c707f
parentb18b12b532790f40edf431625d184bf8e479956b
Merge branch 'branch4.0'

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