Merge branch '3.0.0-wip' into bs3-flatten

author Mark Otto <otto@github.com>

Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)

committer Mark Otto <otto@github.com>

Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)
author Mark Otto <otto@github.com>
Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)
committer Mark Otto <otto@github.com>
Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/components.html
Simple merge
diff --cc docs/templates/pages/components.mustache
Simple merge
diff --cc less/forms.less
Simple merge
author	Mark Otto <otto@github.com>
	Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)
committer	Mark Otto <otto@github.com>
	Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)
		1	2
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/components.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/components.mustache	patch \|	diff1 \|	diff2 \|	blob \| history
less/forms.less	patch \|	diff1 \|	diff2 \|	blob \| history