From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 07:07:19 +0000 (-0700)
Subject: Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1
X-Git-Tag: v3.0.0-rc.2~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a2acb6bf246a9a4667c8c9e0eed8ade5e8cbb83;p=thirdparty%2Fbootstrap.git

Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1
---

2a2acb6bf246a9a4667c8c9e0eed8ade5e8cbb83