From: Éric Araujo <merwok@netwok.org>
Date: Fri, 4 Nov 2011 17:15:45 +0000 (+0100)
Subject: Revert commit that was not a bugfix (#5301).
X-Git-Tag: v2.7.3rc1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7554f0a1159e5c473be34090ee85675f4835a4;p=thirdparty%2FPython%2Fcpython.git

Revert commit that was not a bugfix (#5301).

I won’t revert in 3.2, since Georg pulled this change in 3.2.2 and
released it.
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 834778644006..4c054c961cd7 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -432,7 +432,6 @@ def _default_mime_types():
         '.hdf'    : 'application/x-hdf',
         '.htm'    : 'text/html',
         '.html'   : 'text/html',
-        '.ico'    : 'image/vnd.microsoft.icon',
         '.ief'    : 'image/ief',
         '.jpe'    : 'image/jpeg',
         '.jpeg'   : 'image/jpeg',