]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge remote-tracking branch 'alekstorm/static_args' into merge
authorBen Darnell <ben@bendarnell.com>
Sun, 28 Aug 2011 06:08:48 +0000 (23:08 -0700)
committerBen Darnell <ben@bendarnell.com>
Sun, 28 Aug 2011 06:08:48 +0000 (23:08 -0700)
1  2 
tornado/web.py

diff --cc tornado/web.py
Simple merge