From: Mark Otto <otto@github.com>
Date: Sun, 4 Nov 2012 20:37:44 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~893
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=269be76f4a5d8d6098bbd068b506e6bf72f23e00;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into exploratory
---

269be76f4a5d8d6098bbd068b506e6bf72f23e00