From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 07:36:39 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e555f38ae4b1a2503b8bd3599894bb6011e0adbd;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/less.html
---

e555f38ae4b1a2503b8bd3599894bb6011e0adbd