From: Mark Otto <otto@github.com>
Date: Wed, 5 Dec 2012 19:05:10 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0~81^2~11^2~1^2~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb67366206b318c183b00f6bc6f30652518147b8;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
---

cb67366206b318c183b00f6bc6f30652518147b8