summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:07:13 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-03-27 19:07:13 (GMT)
commit987403bf1494b2f10d27f9be6bf624d7d920dbaf (patch)
treec53895e7dc59e74d662656035e22fe5420b22db9 /Misc/ACKS
parent79a9036d0988749c22294c33894342044878542e (diff)
parentf8d887e0d36afb48381b6e47aba53b9bb54c3b89 (diff)
downloadcpython-987403bf1494b2f10d27f9be6bf624d7d920dbaf.zip
cpython-987403bf1494b2f10d27f9be6bf624d7d920dbaf.tar.gz
cpython-987403bf1494b2f10d27f9be6bf624d7d920dbaf.tar.bz2
merge #11696
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 c05da80..028f99a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -570,6 +570,7 @@ Chris McDonough
Greg McFarlane
Alan McIntyre
Michael McLay
+Mark Mc Mahon
Gordon McMillan
Caolan McNamara
Andrew McNamara