Merge "Make image/vnd.microsoft.icon be an alias for image/x-icon mime type."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 15 Sep 2014 01:28:38 +0000 (01:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 15 Sep 2014 01:28:38 +0000 (01:28 +0000)

Trivial merge