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

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

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

c84b5cf5f52ad9be72adf9de2956baad1d6e025b
diff --cc docs/assets/bootstrap.zip
index 26f9b997a7,3058e4ff88..d3ea531bb2
Binary files differ