summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:43:13 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:43:13 (GMT)
commit15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b (patch)
tree77a4994120e2f591768ebfd2f442de49062fed92 /Misc/ACKS
parent06d736a8916b3ff603097cca105a206232593fae (diff)
parentb52f8767679a7586b61ebac731af234758082b81 (diff)
downloadcpython-15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b.zip
cpython-15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b.tar.gz
cpython-15ec11e4e31b1ed4254057b8d08bea0ab95d8a3b.tar.bz2
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 7bf20c8..3efc454 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -824,6 +824,7 @@ Tim MacKenzie
Nick Maclaren
Don MacMillen
Tomasz Maćkowiak
+Wolfgang Maier
Steve Majewski
Marek Majkowski
Grzegorz Makarewicz