summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-12-23 03:14:17 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-12-23 03:14:17 (GMT)
commit19d2d0801461c83639d6c1a045668a8a3d051f13 (patch)
treed931166f52a3ce7724d229c264649bdc1759583b /Misc
parentcc4ff04bdd7b7030f3474f6fb2f40e7b6b777b8d (diff)
parent83194f5b92551a5e411ec60a487d00802bc0ef55 (diff)
downloadcpython-19d2d0801461c83639d6c1a045668a8a3d051f13.zip
cpython-19d2d0801461c83639d6c1a045668a8a3d051f13.tar.gz
cpython-19d2d0801461c83639d6c1a045668a8a3d051f13.tar.bz2
merge from 3.2. News update.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f051d20..cff3140 100644
--- 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.