summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-04-16 03:38:44 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-04-16 03:38:44 (GMT)
commit62e582cdb491df5a7c9acba6bae8ce9767a69406 (patch)
treef398778c8dc8b377ca7e60e40b92c532ed5da43e /Misc/ACKS
parenta12572ff3a62878f70cfb8fd4cf8c6bc4ac1ba98 (diff)
parent6ac4240b6ce55903f05791e1e3f8c4059a6f25a3 (diff)
downloadcpython-62e582cdb491df5a7c9acba6bae8ce9767a69406.zip
cpython-62e582cdb491df5a7c9acba6bae8ce9767a69406.tar.gz
cpython-62e582cdb491df5a7c9acba6bae8ce9767a69406.tar.bz2
Merge with 3.4
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 4767dde..97154c3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -18,6 +18,7 @@ David Abrahams
Marc Abramowitz
Ron Adam
Ali Afshar
+Nitika Agarwal
Jim Ahlstrom
Farhan Ahmad
Matthew Ahrens