summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-06 05:00:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-10-06 05:00:33 (GMT)
commit72181b2f5385cc709543250b37d077adf3d08043 (patch)
treea5ee8c3b03cb4e419197b736139ecac22469a5ee /Misc/ACKS
parent5db034acfaa79447cb5c310f6ad7071737474027 (diff)
parent15982aad2b09086b5d8819ed5dfb0ec6195fd41a (diff)
downloadcpython-72181b2f5385cc709543250b37d077adf3d08043.zip
cpython-72181b2f5385cc709543250b37d077adf3d08043.tar.gz
cpython-72181b2f5385cc709543250b37d077adf3d08043.tar.bz2
merge 3.4 (#25319)
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 28d25fd..3d257cd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1352,6 +1352,7 @@ Ryan Smith-Roberts
Rafal Smotrzyk
Eric Snow
Dirk Soede
+Nir Soffer
Paul Sokolovsky
Evgeny Sologubov
Cody Somerville