[Python-checkins] cpython (2.7): Revert commit that was not a bugfix (#5301).

[eric.araujo]

http://hg.python.org/cpython/rev/33680de042e7
changeset:   73352:33680de042e7
branch:      2.7
parent:      73347:f09e3b1603ee
user:        Éric Araujo <merwok at netwok.org>
date:        Fri Nov 04 18:15:45 2011 +0100
summary:
  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.

files:
  Lib/mimetypes.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -432,7 +432,6 @@
         '.hdf'    : 'application/x-hdf',
         '.htm'    : 'text/html',
         '.html'   : 'text/html',
-        '.ico'    : 'image/vnd.microsoft.icon',
         '.ief'    : 'image/ief',
         '.jpe'    : 'image/jpeg',
         '.jpeg'   : 'image/jpeg',

-- 
Repository URL: http://hg.python.org/cpython