From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 29 Nov 2012 00:16:58 +0000 (+0200)
Subject: #16549: merge with 3.2.
X-Git-Tag: v3.3.1rc1~585
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e86d01e1ebca5554c51d18dee404658c14bce00;p=thirdparty%2FPython%2Fcpython.git

#16549: merge with 3.2.
---

1e86d01e1ebca5554c51d18dee404658c14bce00
diff --cc Misc/ACKS
index ced316890b16,640287dc5340..996989d5c152
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -888,7 -807,7 +888,8 @@@ Alexandre Parentea
  Dan Parisien
  William Park
  Harri Pasanen
 +Gaël Pasgrimaud
+ Berker Peksag
  Bo Peng
  Joe Peterson
  Randy Pausch