From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 24 Oct 2012 20:06:56 +0000 (+0300)
Subject: #16210: merge with 3.2.
X-Git-Tag: v3.3.1rc1~750
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6c0f0d94aa460388cf58a3a6c146b6c4117d1fd;p=thirdparty%2FPython%2Fcpython.git

#16210: merge with 3.2.
---

e6c0f0d94aa460388cf58a3a6c146b6c4117d1fd
diff --cc Misc/ACKS
index f01619eee9b9,182c6a6d67d5..3ee38640a242
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1055,10 -956,10 +1055,11 @@@ Nick Seidenma
  Yury Selivanov
  Fred Sells
  Jiwon Seo
 +Iñigo Serna
  Joakim Sernbrant
 -Roger Serwy
 +Roger D. Serwy
  Jerry Seutter
+ Pete Sevander
  Denis Severson
  Ian Seyer
  Ha Shao