From: Mark Otto <otto@github.com>
Date: Sun, 2 Jun 2013 21:08:50 +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~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd170e8366ca959e854d7f6c338988bd3ee594a7;p=thirdparty%2Fbootstrap.git

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

bd170e8366ca959e854d7f6c338988bd3ee594a7