summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2015-03-24 10:52:13 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2015-03-24 10:52:13 (GMT)
commit0f05cea05773d0810db6219cd1430d8c46d29a3b (patch)
tree062a2a477baa5407df1332153f0a174d2f724eca /Misc/ACKS
parentf329878e74e1eefffad5c70942bc6cd2c27440d3 (diff)
parent2e3998fae0996bbb349a4696071f0582f8c799c0 (diff)
downloadcpython-0f05cea05773d0810db6219cd1430d8c46d29a3b.zip
cpython-0f05cea05773d0810db6219cd1430d8c46d29a3b.tar.gz
cpython-0f05cea05773d0810db6219cd1430d8c46d29a3b.tar.bz2
#11468: 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 5dc91de..3637ab4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1103,6 +1103,7 @@ Claudiu Popa
John Popplewell
Davin Potts
Guillaume Pratte
+Florian Preinstorfer
Amrit Prem
Paul Prescod
Donovan Preston