]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge remote-tracking branch 'norman-labs/branch2.4'
authorBen Darnell <ben@bendarnell.com>
Fri, 15 Mar 2013 01:36:34 +0000 (21:36 -0400)
committerBen Darnell <ben@bendarnell.com>
Fri, 15 Mar 2013 01:42:49 +0000 (21:42 -0400)
commitae166d72192d001be8c2b349a287a3027fb88db1
treed9a248eaa7dd42dc78cc1ff2571adf12842cc5bc
parent330d8ecf20a85deb65e239ec34987ece868187f7
parentc791984de4db5f661799ea926b4e174c3f6063c2
Merge remote-tracking branch 'norman-labs/branch2.4'

Conflicts:
tornado/httputil.py
tornado/httputil.py
tornado/test/httpserver_test.py