summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-07 22:09:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-07 22:09:36 (GMT)
commitedb07d28fbfd526f0771b337b05c2e611d266981 (patch)
treef6918e3ba213ced7e984d0e0f9585ba84ac8647e /Misc/ACKS
parent8dfd73a2b42917b07698f446e20ab296fdfe0ef2 (diff)
parent3c2dca67ac9cdc26fb02473e05723486ffc8d52b (diff)
downloadcpython-edb07d28fbfd526f0771b337b05c2e611d266981.zip
cpython-edb07d28fbfd526f0771b337b05c2e611d266981.tar.gz
cpython-edb07d28fbfd526f0771b337b05c2e611d266981.tar.bz2
merge 3.4 (#21463)
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 fe894b3..7a5860a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -32,6 +32,7 @@ Fred Allen
Ray Allen
Billy G. Allie
Kevin Altis
+Skyler Leigh Amador
Joe Amenta
A. Amoroso
Mark Anacker