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-rc1~475
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12f043f1bb126d48b6e57eebbfdf12c94e131fb5;p=thirdparty%2Fbootstrap.git

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

12f043f1bb126d48b6e57eebbfdf12c94e131fb5