From: 依云 <lilydjwg@gmail.com>
Date: Sun, 14 Dec 2014 10:00:08 +0000 (+0800)
Subject: Merge branch 'master' into fix-ipv6-host
X-Git-Tag: v4.1.0b1~49^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b100b5ff6cdd709acf7be27feb8ef3fc003b8ea7;p=thirdparty%2Ftornado.git

Merge branch 'master' into fix-ipv6-host
---

b100b5ff6cdd709acf7be27feb8ef3fc003b8ea7
diff --cc tornado/web.py
index 78ab1faf6,6325f7f91..91147b689
mode 100644,100755..100755
--- a/tornado/web.py
+++ b/tornado/web.py