From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 18 Nov 2012 21:24:49 +0000 (-0500)
Subject: Merge branch 'branch2.4'
X-Git-Tag: v3.0.0~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d42de2d0ac9c2b97ec1dd83595a5b3f3de405c3c;p=thirdparty%2Ftornado.git

Merge branch 'branch2.4'

Conflicts:
	website/sphinx/database.rst
---

d42de2d0ac9c2b97ec1dd83595a5b3f3de405c3c