From: Mark Otto <markotto@twitter.com>
Date: Sun, 3 Jun 2012 05:14:12 +0000 (-0700)
Subject: Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
X-Git-Tag: v2.1.0~2^2~334
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a4ee790e1e58e321b604bb66380b2ce2f00faf6;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/js/bootstrap.min.js
---

9a4ee790e1e58e321b604bb66380b2ce2f00faf6