From: Mark Otto <markotto@twitter.com>
Date: Fri, 25 May 2012 02:17:49 +0000 (-0700)
Subject: Merge branch 'ademaro-patch-1' into 2.0.4-wip
X-Git-Tag: v2.0.4~1^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72e3b3beb375706254db144adc632ae90c8fbaad;p=thirdparty%2Fbootstrap.git

Merge branch 'ademaro-patch-1' into 2.0.4-wip
---

72e3b3beb375706254db144adc632ae90c8fbaad