Merge branch 'raphaelz-patch-1' into 2.0.1-wip

author Mark Otto <markdotto@gmail.com>

Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)

committer Mark Otto <markdotto@gmail.com>

Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
author Mark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
committer Mark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
diff --cc docs/assets/bootstrap.zip

index c474e5f0c92c72f8240ada1d9891dbdbce7f8918,e5a1d8b427b04db41b8150479ed7594f17837031..04562df6f995646b3013c698997ffc42f9900c4c

Binary files differ
diff --cc docs/javascript.html
Simple merge
diff --cc docs/templates/pages/javascript.mustache
Simple merge
author	Mark Otto <markdotto@gmail.com>
	Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -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