[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2. News update.

[senthil.kumaran]

http://hg.python.org/cpython/rev/854e9730da6b
changeset:   74136:854e9730da6b
parent:      74133:4b306aee21a4
parent:      74135:9c19df6c8ea0
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Fri Dec 23 11:14:17 2011 +0800
summary:
  merge from 3.2. News update.

files:
  Misc/NEWS |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -419,6 +419,8 @@
 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.
 

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