Merge branch '2.2.2-wip' into exploratory

author Mark Otto <otto@github.com>

Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)

committer Mark Otto <otto@github.com>

Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)
author Mark Otto <otto@github.com>
Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)
committer Mark Otto <otto@github.com>
Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/scaffolding.html
Simple merge
diff --cc docs/templates/pages/scaffolding.mustache
Simple merge
diff --cc less/navbar.less
Simple merge
diff --cc less/tables.less
Simple merge
author	Mark Otto <otto@github.com>
	Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)
committer	Mark Otto <otto@github.com>
	Thu, 15 Nov 2012 17:15:37 +0000 (09:15 -0800)
		1	2
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/scaffolding.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/scaffolding.mustache	patch \|	diff1 \|	diff2 \|	blob \| history
less/navbar.less	patch \|	diff1 \|	diff2 \|	blob \| history
less/tables.less	patch \|	diff1 \|	diff2 \|	blob \| history