Merge branch 'docs-hotfixes' into gh-pages

author Chris Rebert <code@rebertia.com>

Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)

committer Chris Rebert <code@rebertia.com>

Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)
author Chris Rebert <code@rebertia.com>
Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)
committer Chris Rebert <code@rebertia.com>
Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)
diff --cc components.html
Simple merge
diff --cc css.html
Simple merge
author	Chris Rebert <code@rebertia.com>
	Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)
committer	Chris Rebert <code@rebertia.com>
	Thu, 30 Jan 2014 19:31:50 +0000 (11:31 -0800)
		1	2
components.html	patch \|	diff1 \|	diff2 \|	blob \| history
css.html	patch \|	diff1 \|	diff2 \|	blob \| history