From: 项超 <cloudaice@gmail.com>
Date: Thu, 16 May 2013 08:44:45 +0000 (-0700)
Subject: Merge pull request #1 from facebook/master
X-Git-Tag: v3.1.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81935f5642acff990ec876d6c203ee6c8f4f6a13;p=thirdparty%2Ftornado.git

Merge pull request #1 from facebook/master

merge master from facebook tornado
---

81935f5642acff990ec876d6c203ee6c8f4f6a13