From: Mark Otto <markdotto@gmail.com>
Date: Mon, 30 Jan 2012 00:55:56 +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~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b078050702d92551ab53545edfb484f39511278e;p=thirdparty%2Fbootstrap.git

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

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

b078050702d92551ab53545edfb484f39511278e
diff --cc docs/assets/bootstrap.zip
index c443972789,099ed3b1a1..21df15cefa
Binary files differ