From: Mark Otto <otto@github.com>
Date: Fri, 3 May 2013 21:11:23 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14861e9cc32552ee235ceeb7b2bf0459d5298ea0;p=thirdparty%2Fbootstrap.git

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

14861e9cc32552ee235ceeb7b2bf0459d5298ea0