#5301: merge with 3.2

a9931888 · Sandro Tosi · 7209ff2b · 83f7d347 · a9931888
Commit a9931888 authored Aug 21, 2011 by Sandro Tosi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Lib/mimetypes.py Lib/mimetypes.py +1 -0

No files found.
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -425,6 +425,7 @@ 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',