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

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

c5173cdb92f36c29ee4992ba68ea96cf623c55f1