From: Mark Otto <otto@github.com>
Date: Fri, 11 Jan 2013 18:58:17 +0000 (-0800)
Subject: Merge branch 'wilfra-patch-2' into 2.3.0-wip
X-Git-Tag: v3.0.0~81^2~11^2~1^2~88^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98b0d4946f187e5e5145fc8a218d1d0f9b58e4d7;p=thirdparty%2Fbootstrap.git

Merge branch 'wilfra-patch-2' into 2.3.0-wip
---

98b0d4946f187e5e5145fc8a218d1d0f9b58e4d7