From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 1 Jan 2015 18:35:19 +0000 (-0800)
Subject: Merge pull request #15477 from ZDroid/2015
X-Git-Tag: v3.3.2~5^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=401889a8dc7d530d9be3b6b005afe03856089437;p=thirdparty%2Fbootstrap.git

Merge pull request #15477 from ZDroid/2015

Happy New Year
---

401889a8dc7d530d9be3b6b005afe03856089437