Merge branch 'master' into dev

author Mark Otto <mark.otto@twitter.com>

Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)

committer Mark Otto <mark.otto@twitter.com>

Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)
author Mark Otto <mark.otto@twitter.com>
Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)
committer Mark Otto <mark.otto@twitter.com>
Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)
diff --cc bootstrap.css
Simple merge
diff --cc bootstrap.min.css
Simple merge
diff --cc lib/patterns.less
Simple merge
author	Mark Otto <mark.otto@twitter.com>
	Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)
committer	Mark Otto <mark.otto@twitter.com>
	Tue, 4 Oct 2011 07:57:37 +0000 (00:57 -0700)
		1	2
bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
bootstrap.min.css	patch \|	diff1 \|	diff2 \|	blob \| history
lib/patterns.less	patch \|	diff1 \|	diff2 \|	blob \| history