From: Mark Otto <otto@github.com>
Date: Mon, 1 Apr 2013 20:17:31 +0000 (-0700)
Subject: Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsr... 
X-Git-Tag: v3.0.0~81^2~11^2~1^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8454d073722a23746c3f2209034fa8fa035b8302;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel
---

8454d073722a23746c3f2209034fa8fa035b8302