From: Mark Otto <markotto@twitter.com>
Date: Sun, 17 Jun 2012 19:40:43 +0000 (-0700)
Subject: Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
X-Git-Tag: v2.1.0~2^2~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bae3cfd18343ce4909b26f03ee0008f0de1d2d46;p=thirdparty%2Fbootstrap.git

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

bae3cfd18343ce4909b26f03ee0008f0de1d2d46