Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

author Mark Otto <markotto@twitter.com>

Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)

committer Mark Otto <markotto@twitter.com>

Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
author Mark Otto <markotto@twitter.com>
Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
committer Mark Otto <markotto@twitter.com>
Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
diff --cc docs/assets/bootstrap.zip

index 2408ccef9c5915cbbee29a0b5be8ad06db915e0b,536db0ebfc5a10f7324aa3c967308445f1e17c5b..7a94384807a1b88e385be22546471784befcb772

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>
	Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
committer	Mark Otto <markotto@twitter.com>
	Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -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