summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-08 00:55:53 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-08 00:55:53 (GMT)
commit66f80e92c31cdcede9951d661b3538d862f632b1 (patch)
tree2abc71cff5289a96391c7c35b37ad722e5978e41 /Misc
parent9d19da701db80aff583c98fd3278b4f871fc2e05 (diff)
parent96e0430dfb36c5fa336684601bf271b0ce43e367 (diff)
downloadcpython-66f80e92c31cdcede9951d661b3538d862f632b1.zip
cpython-66f80e92c31cdcede9951d661b3538d862f632b1.tar.gz
cpython-66f80e92c31cdcede9951d661b3538d862f632b1.tar.bz2
merge 3.4 (#12063)
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 7a5860a..960035d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -755,6 +755,7 @@ Julia Lawall
Chris Lawrence
Brian Leair
Mathieu Leduc-Hamel
+Amandine Lee
Antony Lee
Christopher Lee
Inyeol Lee