summaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2016-03-13 11:41:45 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2016-03-13 11:41:45 +0200
commit4c9375b65f4788b73cfa46f3daa94143b49273fa (patch)
tree169384668d419f4831a1a47cb8a151dc2850371b /Misc
parent5f6209a3c60e2b7065c1a8466fbf66268a1dbace (diff)
parentf2b9a398133a291a6f0fd42d8a9e42b8ded605fb (diff)
downloadcpython-git-4c9375b65f4788b73cfa46f3daa94143b49273fa.tar.gz
#24918: merge with 3.5.
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 033f02b00e..5f1f300b11 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -766,6 +766,7 @@ Pat Knight
Jeff Knupp
Kubilay Kocak
Greg Kochanski
+Manvisha Kodali
Damon Kohler
Marko Kohtala
Vajrasky Kok