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

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

a43bf14ea5fa7118cfdbed0469d227976fb92a79