]> git.ipfire.org Git - thirdparty/tornado.git/commit
Merge remote-tracking branch 'birknilson/static_version_override' into merge
authorBen Darnell <ben@bendarnell.com>
Sun, 19 May 2013 17:11:53 +0000 (13:11 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 19 May 2013 17:11:53 +0000 (13:11 -0400)
commitaadfa6685288eb7bd8756d6e94c5d9ee9bcf4b2d
tree4f4057240a3f64fa23889c711bdf7b244aaf3aeb
parent1ccf71a5b9d4f2c33705d3306ffc42e0e051046f
parent7d0af33c51dea7eb7cc464541e7e9aecafc6c955
Merge remote-tracking branch 'birknilson/static_version_override' into merge

Conflicts:
tornado/test/web_test.py
tornado/test/web_test.py
tornado/web.py