From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 9 Jul 2014 02:27:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'tictail/branch3.2'
X-Git-Tag: v4.0.0b3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dba499ceb0851bb3623a42751c374b138a458fa6;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'tictail/branch3.2'

Closes #1097
---

dba499ceb0851bb3623a42751c374b138a458fa6