From: WEI Zhicheng <zhicheng@opensourceforge.net>
Date: Thu, 7 Aug 2014 17:46:23 +0000 (+0800)
Subject: Merge pull request #1 from tornadoweb/master
X-Git-Tag: v4.1.0b1~114^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=692e76d856f87519cd325444e5d71439126b335e;p=thirdparty%2Ftornado.git

Merge pull request #1 from tornadoweb/master

update from upstream
---

692e76d856f87519cd325444e5d71439126b335e