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

author Mark Otto <markotto@twitter.com>

Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)

committer Mark Otto <markotto@twitter.com>

Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
author Mark Otto <markotto@twitter.com>
Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
committer Mark Otto <markotto@twitter.com>
Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
diff --cc docs/assets/bootstrap.zip

index 82ee1223cf4392b455bc8f079ff195608945eb4f,9add96d32bff1148c74b92aeeef92b96f854badc..260210777514987f0857b9380e2066c4fe215bb8

Binary files differ
diff --cc docs/javascript.html
Simple merge
diff --cc docs/templates/pages/javascript.mustache
Simple merge
author	Mark Otto <markotto@twitter.com>
	Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
committer	Mark Otto <markotto@twitter.com>
	Tue, 28 Feb 2012 05:22:20 +0000 (21:22 -0800)
		1	2
docs/assets/bootstrap.zip	patch \|	diff1 \|	diff2 \|	blob \| history
docs/javascript.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/javascript.mustache	patch \|	diff1 \|	diff2 \|	blob \| history