From: Mark Otto <markotto@twitter.com>
Date: Tue, 28 Feb 2012 05:22:20 +0000 (-0800)
Subject: Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
X-Git-Tag: v2.0.2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1;p=thirdparty%2Fbootstrap.git

Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip

Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
---

5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1
diff --cc docs/assets/bootstrap.zip
index 82ee1223cf,9add96d32b..2602107775
Binary files differ