From: Mark Otto <otto@github.com>
Date: Thu, 25 Jul 2013 16:57:40 +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~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3aaba0be2394bad27140a242431bc7afe518a13;p=thirdparty%2Fbootstrap.git

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

f3aaba0be2394bad27140a242431bc7afe518a13