Merge branch 'bs3-input-groups' into 3.0.0-wip

author Mark Otto <otto@github.com>

Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)

committer Mark Otto <otto@github.com>

Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)
author Mark Otto <otto@github.com>
Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)
committer Mark Otto <otto@github.com>
Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/css.html
Simple merge
diff --cc docs/templates/pages/css.mustache
Simple merge
diff --cc less/forms.less
Simple merge
author	Mark Otto <otto@github.com>
	Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)
committer	Mark Otto <otto@github.com>
	Thu, 20 Dec 2012 05:02:54 +0000 (21:02 -0800)
		1	2
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/css.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/css.mustache	patch \|	diff1 \|	diff2 \|	blob \| history
less/forms.less	patch \|	diff1 \|	diff2 \|	blob \| history