From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 23 Dec 2011 03:14:17 +0000 (+0800)
Subject: merge from 3.2. News update.
X-Git-Tag: v3.3.0a1~536
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19d2d0801461c83639d6c1a045668a8a3d051f13;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2. News update.
---

19d2d0801461c83639d6c1a045668a8a3d051f13
diff --cc Misc/NEWS
index f051d20319f3,7e6ce40574da..cff314042935
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -419,14 -97,10 +419,16 @@@ Core and Builtin
  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.
 +
  - Issue #11006: Don't issue low level warning in subprocess when pipe2() fails.
  
 +- Issue #13620: Support for Chrome browser in webbrowser.py Patch contributed
 +  by Arnaud Calmettes.
 +
  - Issue #11829: Fix code execution holes in inspect.getattr_static for
    metaclasses with metaclasses. Patch by Andreas Stührk.