From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Sat, 25 Jun 2011 08:11:44 +0000 (+0200)
Subject: Merge with 3.2 (Issue #12404).
X-Git-Tag: v3.3.0a1~2060
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1db37f3248697d0a6fa24cea6b7112651f0e4abb;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2 (Issue #12404).
---

1db37f3248697d0a6fa24cea6b7112651f0e4abb
diff --cc Misc/NEWS
index 4e4b47c7c069,9dfd0aca2fd8..6786cad716a7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -200,9 -25,9 +200,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira
+   Kitada.
+ 
 +- Issue #1874: email now detects and reports as a defect the presence of
 +  any CTE other than 7bit, 8bit, or binary on a multipart.
 +
  - Issue #12383: Fix subprocess module with env={}: don't copy the environment
    variables, start with an empty environment.