From: Mark Otto <otto@github.com>
Date: Fri, 16 Aug 2013 04:09:40 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' into gh-pages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=908207ed0cb93b97950f744458c21cfaecd922e6;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into gh-pages
---

908207ed0cb93b97950f744458c21cfaecd922e6