From: Mark Otto <otto@github.com>
Date: Thu, 17 Jan 2013 20:21:34 +0000 (-0800)
Subject: Merge branch 'ravage84-patch-2' into 2.3.0-wip
X-Git-Tag: v2.3.0^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbb3c0a0e6b4134264f341c2714c4cadccb23e5c;p=thirdparty%2Fbootstrap.git

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

bbb3c0a0e6b4134264f341c2714c4cadccb23e5c