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

author Jacob Thornton <jacobthornton@gmail.com>

Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)

committer Jacob Thornton <jacobthornton@gmail.com>

Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
author Jacob Thornton <jacobthornton@gmail.com>
Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
committer Jacob Thornton <jacobthornton@gmail.com>
Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
diff --cc docs/assets/bootstrap.zip

index c850abc8969905123798ed2607b0ac56cba786b3,1619fc54fa5857e40b90e1a4662939be20f3d496..18f938cf9c3b687c4f77406cacda431095ca7775

Binary files differ
diff --cc docs/javascript.html
Simple merge
diff --cc docs/templates/pages/javascript.mustache
Simple merge
author	Jacob Thornton <jacobthornton@gmail.com>
	Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -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