From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 07:12:28 +0000 (+0200)
Subject: #16154: merge with 3.2.
X-Git-Tag: v3.3.1rc1~385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0;p=thirdparty%2FPython%2Fcpython.git

#16154: merge with 3.2.
---

5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0
diff --cc Misc/ACKS
index 5e06870531a0,3b8c7f295026..ae00e88e4ae7
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1102,7 -998,7 +1102,8 @@@ Michael Simcic
  Ionel Simionescu
  Kirill Simonov
  Nathan Paul Simons
 +Adam Simpkins
+ Ravi Sinha
  Janne Sinkkonen
  Ng Pheng Siong
  George Sipe