summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-07-15 19:10:59 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-07-15 19:10:59 (GMT)
commit1a41d7d51d34bac1f6d429d75ff517d609c2ef8f (patch)
tree72236a6962e367578cd0e95c674394c9bec05bb8 /Misc
parente92cd0ce987d11acf2b93d43171f61c297e935ba (diff)
parent874d65afaef54993eb5779c31611f5f3baa995e2 (diff)
downloadcpython-1a41d7d51d34bac1f6d429d75ff517d609c2ef8f.zip
cpython-1a41d7d51d34bac1f6d429d75ff517d609c2ef8f.tar.gz
cpython-1a41d7d51d34bac1f6d429d75ff517d609c2ef8f.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 93ae3ee..1565d72 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -228,6 +228,9 @@ Core and Builtins
Library
-------
+- Issue #11321: Fix a crash with multiple imports of the _pickle module when
+ embedding Python. Patch by Andreas Stührk.
+
- Issue #6755: Add get_wch() method to curses.window class. Patch by Iñigo
Serna.