From: Mark Otto <otto@github.com>
Date: Mon, 15 Jul 2013 19:00:10 +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~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ced641b1079ae9ab1b59c39ce9edf82b85b3fb37;p=thirdparty%2Fbootstrap.git

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

ced641b1079ae9ab1b59c39ce9edf82b85b3fb37