summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2014-08-04 14:17:21 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2014-08-04 14:17:21 (GMT)
commitc734c387dee2f71f25e3dee0b2566f7eca960741 (patch)
tree8c7bbeb46ca4553b71bafa5736d49f7d71300822 /Misc
parentb398d3e4415291cd3fc779c1b49b10c5e39cde50 (diff)
parentd577480197f7cc427ac75deaebae3106399a9cd3 (diff)
downloadcpython-c734c387dee2f71f25e3dee0b2566f7eca960741.zip
cpython-c734c387dee2f71f25e3dee0b2566f7eca960741.tar.gz
cpython-c734c387dee2f71f25e3dee0b2566f7eca960741.tar.bz2
#20977: merge with 3.4.
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 dfe7c5f..2c3852e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -35,6 +35,7 @@ Billy G. Allie
Kevin Altis
Skyler Leigh Amador
Joe Amenta
+Rose Ames
A. Amoroso
Mark Anacker
Shashwat Anand