From: Mark Otto <markdotto@gmail.com>
Date: Sun, 8 Jun 2014 18:23:20 +0000 (-0700)
Subject: Merge pull request #13542 from twbs/icon_paths
X-Git-Tag: v3.2.0~122^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2919a3dd80648be75614cc7ffc7bee9d3fa42783;p=thirdparty%2Fbootstrap.git

Merge pull request #13542 from twbs/icon_paths

Fixes #13478, reverts #10941
---

2919a3dd80648be75614cc7ffc7bee9d3fa42783