From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 31 Jan 2012 21:59:08 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e75bc5eb5ffca534fd3a84d749e8b39824654ebb;p=thirdparty%2Fbootstrap.git

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

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

e75bc5eb5ffca534fd3a84d749e8b39824654ebb
diff --cc docs/assets/bootstrap.zip
index 9fa9c1f605,554bd04e4a..3058e4ff88
Binary files differ