summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-11 07:42:40 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-11 07:42:40 (GMT)
commitc9cfcf1e6cd946492be949533de906785d690069 (patch)
treef73cd5e3c77ea2b11f21b4be57020bda53cc6a6e /Misc
parent3300878d8c9ca454c78a7222e6b91f75cafbfa49 (diff)
parentaf8838f4430cec7ba36caf3ce419a5205451c02a (diff)
downloadcpython-c9cfcf1e6cd946492be949533de906785d690069.zip
cpython-c9cfcf1e6cd946492be949533de906785d690069.tar.gz
cpython-c9cfcf1e6cd946492be949533de906785d690069.tar.bz2
#17351: merge with 3.2.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0aa64b7..247b10e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -331,6 +331,7 @@ Andrew Eland
Julien Élie
Lance Ellinghaus
Daniel Ellis
+Phil Elson
David Ely
Jeff Epler
Jeff McNeil