From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Jun 2011 00:07:45 +0000 (-0500)
Subject: merge 3.2 (#12221)
X-Git-Tag: v3.3.0a1~2183^2~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e3e1c6e4e98b7568fcb29708aeac88bc677c62c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#12221)
---

9e3e1c6e4e98b7568fcb29708aeac88bc677c62c
diff --cc Misc/NEWS
index b85de5060c8a,baf235c23e3a..b3d21f891563
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -780,6 -486,6 +780,8 @@@ Tools/Demo
  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.