From: Mark Otto <otto@github.com>
Date: Sat, 18 Jan 2014 22:12:04 +0000 (-0800)
Subject: Merge branch 'master' into modal-md
X-Git-Tag: v3.1.0~59^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12249%2Fhead;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into modal-md
---

cfe38a424102881b2af7db455a3d32e34ccca6e2