summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-21 21:17:34 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-21 21:17:34 (GMT)
commit8a268b985ff9aa2c65fe0540f7a6ffea2265a963 (patch)
treec02cb68b857019cd17076a904c82bea23ddac875 /Misc/ACKS
parent920007ad76f1a880e6784ddb97a5c6c99a19b9a9 (diff)
parent600b71167e386de4a4259947935d14ac091c5741 (diff)
downloadcpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.zip
cpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.tar.gz
cpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.tar.bz2
#17255: merge with 3.3.
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e9f0205..9d557a6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -426,6 +426,7 @@ Johannes Gijsbers
Michael Gilfix
Yannick Gingras
Matt Giuca
+Wim Glenn
Michael Goderbauer
Christoph Gohlke
Tim Golden