From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 24 Jul 2013 05:59:33 +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~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cfa1c8a30beb081167105b7ea006e9089e566f5;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	dist/js/bootstrap.min.js
---

3cfa1c8a30beb081167105b7ea006e9089e566f5