summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-21 21:17:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-21 21:17:08 (GMT)
commit600b71167e386de4a4259947935d14ac091c5741 (patch)
tree7cfd8d607c72ab919b70e3667a6acd3a27d37997 /Misc/ACKS
parented891c151748d030a890d50f3bbce3f581304439 (diff)
parent0f4377c100049a80d2338de3b9f3b7c7489a08b3 (diff)
downloadcpython-600b71167e386de4a4259947935d14ac091c5741.zip
cpython-600b71167e386de4a4259947935d14ac091c5741.tar.gz
cpython-600b71167e386de4a4259947935d14ac091c5741.tar.bz2
#17255: merge with 3.2.
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 e46be50..3fa29ef 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -423,6 +423,7 @@ Johannes Gijsbers
Michael Gilfix
Yannick Gingras
Matt Giuca
+Wim Glenn
Michael Goderbauer
Christoph Gohlke
Tim Golden