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: v2.3.0^2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=839f83c610e072d23967656e919996b88475fe80;p=thirdparty%2Fbootstrap.git

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

839f83c610e072d23967656e919996b88475fe80