Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip

author Mark Otto <markotto@twitter.com>

Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)

committer Mark Otto <markotto@twitter.com>

Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
author Mark Otto <markotto@twitter.com>
Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
committer Mark Otto <markotto@twitter.com>
Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
diff --cc docs/assets/bootstrap.zip

index 6dedf14358011bc6c197954ef49b9f50ce3a3ce9,26436c0a2d6689fe2fa67c859f436b647b8a79ab..b385a1b2e01322790b78feb564116580ca2bbed0

Binary files differ
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/buttons.less
Simple merge
author	Mark Otto <markotto@twitter.com>
	Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
committer	Mark Otto <markotto@twitter.com>
	Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
		1	2
docs/assets/bootstrap.zip	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/buttons.less	patch \|	diff1 \|	diff2 \|	blob \| history