Merge branch 'wpbrains-media-component' into 2.1.2-wip

author Mark Otto <markotto@twitter.com>

Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)

committer Mark Otto <markotto@twitter.com>

Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)
author Mark Otto <markotto@twitter.com>
Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)
committer Mark Otto <markotto@twitter.com>
Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)
diff --cc docs/assets/css/bootstrap-responsive.css
Simple merge
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/bootstrap.less
Simple merge
diff --cc less/responsive-767px-max.less
Simple merge
author	Mark Otto <markotto@twitter.com>
	Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)
committer	Mark Otto <markotto@twitter.com>
	Tue, 18 Sep 2012 01:15:44 +0000 (18:15 -0700)
		1	2
docs/assets/css/bootstrap-responsive.css	patch \|	diff1 \|	diff2 \|	blob \| history
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/bootstrap.less	patch \|	diff1 \|	diff2 \|	blob \| history
less/responsive-767px-max.less	patch \|	diff1 \|	diff2 \|	blob \| history