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

Merge branch 'master' into derp

Conflicts:
	docs/_includes/components/alerts.html
	docs/_includes/getting-started/browser-device-support.html
---

4e55a867a02550030609dbf675aa1e00aeb92e9f