From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 05:09:24 +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~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0447e9aa54898ea46596e0e2077f33f0dbd1968;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/css/bootstrap.css
---

d0447e9aa54898ea46596e0e2077f33f0dbd1968