From: Mark Otto <otto@github.com>
Date: Thu, 26 Jun 2014 09:49:35 +0000 (-0700)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.2.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1de2f68bdcecd9a1e19548fe9152ead1b5e1bad4;p=thirdparty%2Fbootstrap.git

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

1de2f68bdcecd9a1e19548fe9152ead1b5e1bad4