From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Feb 2013 21:38:05 +0000 (+0200)
Subject: #17178: merge with 3.2.
X-Git-Tag: v3.3.1rc1~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=293ab9728aafc86e33b268049ce598dccf56ff51;p=thirdparty%2FPython%2Fcpython.git

#17178: merge with 3.2.
---

293ab9728aafc86e33b268049ce598dccf56ff51
diff --cc Misc/ACKS
index cddf1610b5b0,9ccc8e16c430..e46be50ef583
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -39,8 -36,8 +39,9 @@@ Pehr Anderso
  Erik Andersén
  Oliver Andrich
  Ross Andrus
 +Juancarlo Añez
  Jérémy Anger
+ Ankur Ankan
  Jon Anglin
  Heidi Annexstad
  Éric Araujo