From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 29 Sep 2012 23:39:44 +0000 (-0700)
Subject: Merge branch 'futures'
X-Git-Tag: v3.0.0~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7488fb4c7a46362dc1ef174117a718ce185de9;p=thirdparty%2Ftornado.git

Merge branch 'futures'
---

6e7488fb4c7a46362dc1ef174117a718ce185de9