summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-08-24 21:45:36 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-08-24 21:45:36 (GMT)
commitc7876464e7b3ea0fb118afa1ec13d1849f7fa42d (patch)
treef7994043ebd045e203b4d9646a24743fd54e6c9c /Misc
parentdd30830d8ab9a032eeb0f2b6fe53f55e4f18be3c (diff)
parented789f9cf9586d94e85115bb516a2ab6b9a2f668 (diff)
downloadcpython-c7876464e7b3ea0fb118afa1ec13d1849f7fa42d.zip
cpython-c7876464e7b3ea0fb118afa1ec13d1849f7fa42d.tar.gz
cpython-c7876464e7b3ea0fb118afa1ec13d1849f7fa42d.tar.bz2
Issue #6057: Merge from 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 46f4ae7..ca0948c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1377,6 +1377,7 @@ Shiyao Ma
Alex Shkop
Joel Shprentz
Yue Shuaijie
+Jaysinh Shukla
Terrel Shumway
Eric Siegerman
Paul Sijben