merge from 3.2. News update.

19d2d080 · Senthil Kumaran · cc4ff04b · 83194f5b · 19d2d080
Commit 19d2d080 authored Dec 23, 2011 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Misc/NEWS Misc/NEWS +2 -0

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -419,6 +419,8 @@ Core and Builtins
 Library
 -------

+- Issue #12798: Updated the mimetypes documentation.
+
 - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the
  SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option.