From: Mark Otto <markdotto@gmail.com>
Date: Mon, 30 Jan 2012 08:43:57 +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~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f088af855908dc2e093772cfcf54c30893b952a;p=thirdparty%2Fbootstrap.git

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

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

0f088af855908dc2e093772cfcf54c30893b952a
diff --cc docs/assets/bootstrap.zip
index f42b5b57bf,6eb49b183e..75d6f207e9
Binary files differ