From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 22 Mar 2012 04:37:17 +0000 (-0700)
Subject: Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
X-Git-Tag: v2.0.3~5^2~108^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22963d73467a604b845dbebc03c9b8fa16ba2e23;p=thirdparty%2Fbootstrap.git

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

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

22963d73467a604b845dbebc03c9b8fa16ba2e23
diff --cc docs/assets/bootstrap.zip
index e6c6aab42e,60cf1993b8..a4e3982293
Binary files differ