From: Mark Otto <otto@github.com>
Date: Tue, 13 Aug 2013 23:11:26 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' into gh-pages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17f9ddd8ec6e7b76f6361b25b85e8b675a410880;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into gh-pages

Conflicts:
	components.html
---

17f9ddd8ec6e7b76f6361b25b85e8b675a410880