]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge commit 'bbd1f9'
authorBen Darnell <ben@bendarnell.com>
Wed, 14 Jan 2015 13:59:21 +0000 (08:59 -0500)
committerBen Darnell <ben@bendarnell.com>
Wed, 14 Jan 2015 13:59:21 +0000 (08:59 -0500)
commit27c54653ac0744032cdb1be8b435da8b50b73591
treeb2ea09d64557df3722329de9e5de05e4743a3bac
parent2e5c6d7fec6871f5c5e87b433ec4c383b9f4ceb7
parentbbd1f90107c08582828f579d551e02045202c002
Merge commit 'bbd1f9'

Conflicts:
.travis.yml
.travis.yml