From: Mark Otto <markdotto@gmail.com>
Date: Sun, 30 Nov 2014 09:32:03 +0000 (-0800)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.3.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6fc081c91475237348fb1c75cf307a4acd69161;p=thirdparty%2Fbootstrap.git

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

e6fc081c91475237348fb1c75cf307a4acd69161