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

Merge branch '2.2.2-wip-holder' into 2.2.2-wip
---

52e669d6192aa5a97c159450e985429be6992d07