From: Mark Otto <otto@github.com>
Date: Fri, 21 Dec 2012 04:56:00 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~836
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d4e7184466a46d7844c8156edda5a7ccef54aad;p=thirdparty%2Fbootstrap.git

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

5d4e7184466a46d7844c8156edda5a7ccef54aad