From: Mark Otto <otto@github.com>
Date: Sun, 20 Oct 2013 23:53:57 +0000 (-0700)
Subject: Merge branch 'master' into carousel_indicators_ie
X-Git-Tag: v3.0.1~39^2~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e70642dd2ea14f3cff6e245b3f60ee69c97c793;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into carousel_indicators_ie
---

5e70642dd2ea14f3cff6e245b3f60ee69c97c793