From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 30 Jan 2012 03:07:14 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~35^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0de951f4f41c798dead8525e78153fc6c5da1479;p=thirdparty%2Fbootstrap.git

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

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

0de951f4f41c798dead8525e78153fc6c5da1479
diff --cc docs/assets/bootstrap.zip
index dafd812dc7,cb200386a7..6eb49b183e
Binary files differ