From: Mark Otto <otto@github.com>
Date: Sun, 13 Jul 2014 07:23:09 +0000 (-0700)
Subject: Merge branch 'master' into derp
X-Git-Tag: v4.0.0-alpha~680
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85e6af91b994d90e0078d41ac701080205443d2;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into derp

Conflicts:
	docs/_includes/components/alerts.html
	docs/javascript/dropdowns.md
---

d85e6af91b994d90e0078d41ac701080205443d2