From: Mark Otto <otto@github.com>
Date: Thu, 18 Jul 2013 06:34:31 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b;p=thirdparty%2Fbootstrap.git

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

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

4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b