From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 12 Feb 2012 19:07:34 +0000 (-0800)
Subject: Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
X-Git-Tag: v2.0.1~1^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f;p=thirdparty%2Fbootstrap.git

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

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

d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f
diff --cc docs/assets/bootstrap.zip
index c850abc896,1619fc54fa..18f938cf9c
Binary files differ