From: Mark Otto <otto@github.com>
Date: Tue, 11 Feb 2014 05:58:50 +0000 (-0800)
Subject: Merge branch 'master' into document_popover_focus
X-Git-Tag: v3.2.0~425^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642fd5100293755a6003448d4a481f3b314edf15;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into document_popover_focus
---

642fd5100293755a6003448d4a481f3b314edf15