From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 20 Feb 2012 04:04:13 +0000 (-0800)
Subject: Merge remote-tracking branch 'minrk/strkeys' into work
X-Git-Tag: v2.3.0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca74f675e5bbba14eef025564836b7eec381ae5;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'minrk/strkeys' into work
---

dca74f675e5bbba14eef025564836b7eec381ae5