From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 15 Sep 2014 01:28:38 +0000 (+0000)
Subject: Merge "Make image/vnd.microsoft.icon be an alias for image/x-icon mime type."
X-Git-Tag: 1.31.0-rc.0~14024
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=038bde3276d1caa9804fbea170b1921cc9058546;p=lhc%2Fweb%2Fwiklou.git

Merge "Make image/vnd.microsoft.icon be an alias for image/x-icon mime type."
---

038bde3276d1caa9804fbea170b1921cc9058546