From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 18:34:44 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc.2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1462fe2c8129b8d30d2fc797b8b465b17ef2d869;p=thirdparty%2Fbootstrap.git

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

1462fe2c8129b8d30d2fc797b8b465b17ef2d869