From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 10 Mar 2012 20:42:39 +0000 (-0800)
Subject: Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
X-Git-Tag: v2.0.2~56^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fd5e558811a63703e01b6e5e75c44820e59dfc9;p=thirdparty%2Fbootstrap.git

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

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

1fd5e558811a63703e01b6e5e75c44820e59dfc9
diff --cc docs/assets/bootstrap.zip
index 502139c251,086c8db293..808f3ff19c
Binary files differ