From: Mark Otto <otto@github.com>
Date: Sun, 18 Aug 2013 22:30:02 +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~69^2~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5746979aad4b86dae951ef2120aa4dd1314e7ade;p=thirdparty%2Fbootstrap.git

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

5746979aad4b86dae951ef2120aa4dd1314e7ade