From: Ivan Khalopik <ikhalopik@gmail.com>
Date: Tue, 7 May 2013 12:16:45 +0000 (+0300)
Subject: Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~206^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c7a43a1f373d0c534476578b96a75ae2e63c985;p=thirdparty%2Fbootstrap.git

Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js
---

3c7a43a1f373d0c534476578b96a75ae2e63c985