summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-03-12 23:33:30 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-03-12 23:33:30 (GMT)
commitcc50ba26bd186dd2f7e093be9f7b7bb18d08a35a (patch)
tree49df4f5970ca26db83c632c2a2ab65f6d9c1ac7e /Misc
parenta8ec5ea923c86415835ddecae795071804dca69d (diff)
parentdf723e1e5e4e0022a28618f953219aaf52852643 (diff)
downloadcpython-cc50ba26bd186dd2f7e093be9f7b7bb18d08a35a.zip
cpython-cc50ba26bd186dd2f7e093be9f7b7bb18d08a35a.tar.gz
cpython-cc50ba26bd186dd2f7e093be9f7b7bb18d08a35a.tar.bz2
#14179: 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 061df39..48bdde4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -687,6 +687,7 @@ Andrii V. Mishkovskyi
Dom Mitchell
Dustin J. Mitchell
Zubin Mithra
+Florian Mladitsch
Doug Moen
The Dragon De Monsyne
Skip Montanaro