Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

author Mark Otto <markdotto@gmail.com>

Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)

committer Mark Otto <markdotto@gmail.com>

Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
author Mark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
committer Mark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
diff --cc docs/assets/bootstrap.zip

index f42b5b57bf0fd36bc42c84c1c518d2a04358b848,6eb49b183e0dc9869df48d68bd1e753969436ac3..75d6f207e97fb8c774ab734536d6d36b9173ade3

Binary files differ
diff --cc docs/assets/css/bootstrap-responsive.css
Simple merge
diff --cc less/responsive.less
Simple merge
author	Mark Otto <markdotto@gmail.com>
	Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)
		1	2
docs/assets/bootstrap.zip	patch \|	diff1 \|	diff2 \|	blob \| history
docs/assets/css/bootstrap-responsive.css	patch \|	diff1 \|	diff2 \|	blob \| history
less/responsive.less	patch \|	diff1 \|	diff2 \|	blob \| history