From: Mark Otto <otto@github.com>
Date: Fri, 30 Nov 2012 05:06:11 +0000 (-0800)
Subject: Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
X-Git-Tag: v2.2.2~43^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9c32fdf6d19c98679b4923c2ccc961990c4e626;p=thirdparty%2Fbootstrap.git

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

e9c32fdf6d19c98679b4923c2ccc961990c4e626