From: Mark Otto <otto@github.com>
Date: Tue, 30 Oct 2012 05:01:58 +0000 (-0700)
Subject: Merge branch '2.1.2-wip'
X-Git-Tag: v2.2.0^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5af762ef59e1fa97f4386f5feadb67aa5183fef;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.2-wip'

Conflicts:
	js/bootstrap-dropdown.js
---

b5af762ef59e1fa97f4386f5feadb67aa5183fef