summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-07-15 19:11:23 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-07-15 19:11:23 (GMT)
commit58059197cc2a8c6f1fd3fb0e95614def14d0aaff (patch)
treed3e06fcd53f64d03c9593a1ba494c14b77b65c17 /Misc
parent5afa03a72ee6d27e742dc0ebc06a0630e1b37fe9 (diff)
parent8391cf4e1d73683795e51ac5ce8ee9e61eea389d (diff)
downloadcpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.zip
cpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.tar.gz
cpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.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 cba337a..43d16a3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,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 #12502: asyncore: fix polling loop with AF_UNIX sockets.
- Issue #4376: ctypes now supports nested structures in a endian different than