From: Mark Otto <otto@github.com>
Date: Fri, 18 Jan 2013 04:23:33 +0000 (-0800)
Subject: Merge branch '2.3.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0~81^2~11^2~1^2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68475f87079124710e2f3c2eb96dbd6a45df16cd;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
---

68475f87079124710e2f3c2eb96dbd6a45df16cd