From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 21 Feb 2013 21:17:08 +0000 (+0200)
Subject: #17255: merge with 3.2.
X-Git-Tag: v3.3.1rc1~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=600b71167e386de4a4259947935d14ac091c5741;p=python

#17255: merge with 3.2.
---

600b71167e386de4a4259947935d14ac091c5741
diff --cc Misc/ACKS
index e46be50ef5,74b191d326..3fa29efa0e
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -421,9 -386,8 +421,10 @@@ Dinu Gherma
  Jonathan Giddy
  Johannes Gijsbers
  Michael Gilfix
 +Yannick Gingras
  Matt Giuca
+ Wim Glenn
 +Michael Goderbauer
  Christoph Gohlke
  Tim Golden
  Guilherme Gonçalves