From: Mark Otto <otto@github.com>
Date: Mon, 4 Feb 2013 19:12:09 +0000 (-0800)
Subject: Merge branch '2.3.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~709
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a3e3a50fe78dab1ce6e2359a78b6aa5246e3c50;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
---

0a3e3a50fe78dab1ce6e2359a78b6aa5246e3c50