Merge branch '2.1.0-wip' into 2.0.3-wip

author Mark Otto <markotto@twitter.com>

Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)

committer Mark Otto <markotto@twitter.com>

Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)
author Mark Otto <markotto@twitter.com>
Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)
committer Mark Otto <markotto@twitter.com>
Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)
diff --cc docs/assets/bootstrap.zip

index a07fb5664dd58b4c6751c3532d9f5960623aa7f5,abd205cd1d5ab4301e1aa28325bfcf590aa13e3e..cd93364e479919eef559d53136d0b8f84820a972

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>
	Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)
committer	Mark Otto <markotto@twitter.com>
	Sat, 24 Mar 2012 01:29:21 +0000 (18:29 -0700)
		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