From: Mark Otto <otto@github.com>
Date: Fri, 30 Nov 2012 05:06:20 +0000 (-0800)
Subject: Merge branch 'jblotus-patch-1' into 2.2.2-wip
X-Git-Tag: v2.2.2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12aa060efdc0647368109dd77a55861ad5225912;p=thirdparty%2Fbootstrap.git

Merge branch 'jblotus-patch-1' into 2.2.2-wip
---

12aa060efdc0647368109dd77a55861ad5225912