From: Mark Otto <otto@github.com>
Date: Wed, 30 Oct 2013 16:00:29 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4854301d2a1ead2ada842a5a84f224422a7c71d;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into gh-pages

Conflicts:
	_layouts/home.html
	assets/css/docs.css
---

f4854301d2a1ead2ada842a5a84f224422a7c71d