From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 25 May 2013 21:51:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'wolever/fix-staticfile-serving' into merge
X-Git-Tag: v3.1.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4a59e1a484f6da9fcd73a96d0a7c204beb8296;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'wolever/fix-staticfile-serving' into merge

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

9c4a59e1a484f6da9fcd73a96d0a7c204beb8296