summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:38:05 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:38:05 (GMT)
commit293ab9728aafc86e33b268049ce598dccf56ff51 (patch)
tree2473f139ed25368fdc085a96f8144b81033edbe8 /Misc
parentdb0b7be566f9442f8d09548b4ae1e4d475e09fc0 (diff)
parentb19ed57d8d75b1183193558a9880db44b95157b3 (diff)
downloadcpython-293ab9728aafc86e33b268049ce598dccf56ff51.zip
cpython-293ab9728aafc86e33b268049ce598dccf56ff51.tar.gz
cpython-293ab9728aafc86e33b268049ce598dccf56ff51.tar.bz2
#17178: merge with 3.2.
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 cddf161..e46be50 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -41,6 +41,7 @@ Oliver Andrich
Ross Andrus
Juancarlo Añez
Jérémy Anger
+Ankur Ankan
Jon Anglin
Heidi Annexstad
Éric Araujo