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

author Mark Otto <markdotto@gmail.com>

Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)

committer Mark Otto <markdotto@gmail.com>

Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
author Mark Otto <markdotto@gmail.com>
Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
committer Mark Otto <markdotto@gmail.com>
Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
diff --cc docs/assets/bootstrap.zip

index 26f9b997a7f69d2b2e5564e488940e2e81d4f154,3058e4ff88a73eb315489656f0cecb3e882bf68c..d3ea531bb2fb033be805b17e80fcf58bb7a31afa

Binary files differ
diff --cc docs/examples.html
Simple merge
diff --cc docs/less.html
Simple merge
author	Mark Otto <markdotto@gmail.com>
	Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
committer	Mark Otto <markdotto@gmail.com>
	Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
		1	2
docs/assets/bootstrap.zip	patch \|	diff1 \|	diff2 \|	blob \| history
docs/examples.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/less.html	patch \|	diff1 \|	diff2 \|	blob \| history