From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 19 Apr 2015 15:22:13 +0000 (-0400)
Subject: Merge pull request #1422 from ajdavis/timeouts-not-deadlines
X-Git-Tag: v4.2.0b1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a2cab2910bf5d0e9862492b28be2337d9a7de0;p=thirdparty%2Ftornado.git

Merge pull request #1422 from ajdavis/timeouts-not-deadlines

Timeouts not deadlines.
---

86a2cab2910bf5d0e9862492b28be2337d9a7de0