summaryrefslogtreecommitdiff
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-31 19:07:45 -0500
committerBenjamin Peterson <benjamin@python.org>2011-05-31 19:07:45 -0500
commit9e3e1c6e4e98b7568fcb29708aeac88bc677c62c (patch)
tree6f48941c1d0b4b690b85c4f58eca74d35e7a7537 /Misc/NEWS
parent87cdb81646f6628922c5781dbc15a4dbffb8e923 (diff)
parent0aa71f79821e22c987f86808b0333d57c663728c (diff)
downloadcpython-git-9e3e1c6e4e98b7568fcb29708aeac88bc677c62c.tar.gz
merge 3.2 (#12221)
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b85de5060c..b3d21f8915 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -780,6 +780,8 @@ Tools/Demos
Extension Modules
-----------------
+- Issue #12221: Replace pyexpat.__version__ with the Python version.
+
- Issue #12051: Fix segfault in json.dumps() while encoding highly-nested
objects using the C accelerations.