From: Mark Otto <otto@github.com>
Date: Thu, 23 Jan 2014 03:15:25 +0000 (-0600)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.1.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9454914268f9720ef3c098c7cddfaf5e9db333f;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of github.com:twbs/bootstrap
---

b9454914268f9720ef3c098c7cddfaf5e9db333f