From: Mark Otto <markdotto@gmail.com>
Date: Mon, 30 Jan 2012 00:42:37 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0976bb379d2c8826c13769a53f94079aa161c45;p=thirdparty%2Fbootstrap.git

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/bootstrap.zip
---

b0976bb379d2c8826c13769a53f94079aa161c45
diff --cc docs/assets/bootstrap.zip
index bd974a4625,dbceeaa255..7a18bce0de
Binary files differ