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

Merge branch 'master' into carousel_indicators_ie

Conflicts:
	dist/css/bootstrap.min.css
---

ac6a7f044e71bc2aa7a7aee1700b204ebd7a20bf