From: Mark Otto <otto@github.com>
Date: Sun, 18 Aug 2013 09:04:10 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' into bs3_restore_glyphicons
X-Git-Tag: v3.0.0~69^2~24^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e5fa15e05daa1f39d20374e90ec0fb542ab9ba;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into bs3_restore_glyphicons
---

c7e5fa15e05daa1f39d20374e90ec0fb542ab9ba