From: Mark Otto <otto@github.com>
Date: Wed, 6 Feb 2013 03:53:44 +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~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db1b902c8a5905a382a572c7b54776b10ca2e6b;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
---

3db1b902c8a5905a382a572c7b54776b10ca2e6b