Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into...

author Mark Otto <markotto@twitter.com>

Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)

committer Mark Otto <markotto@twitter.com>

Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)
author Mark Otto <markotto@twitter.com>
Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)
committer Mark Otto <markotto@twitter.com>
Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)
diff --cc docs/assets/bootstrap.zip

index 0fd350f5b519a1f35f0a709c686558583e35cc9b,29867c1bb617a257a9cf91043cf3854559d86f29..47b4749c918a3d4fadc9388140f386851083d876

Binary files differ
diff --cc docs/assets/css/bootstrap-responsive.css
Simple merge
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc less/navs.less
Simple merge
author	Mark Otto <markotto@twitter.com>
	Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)
committer	Mark Otto <markotto@twitter.com>
	Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)
		1	2
docs/assets/bootstrap.zip	patch \|	diff1 \|	diff2 \|	blob \| history
docs/assets/css/bootstrap-responsive.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
less/navs.less	patch \|	diff1 \|	diff2 \|	blob \| history