summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2012-02-12 19:06:57 (GMT)
committerPetri Lehtinen <petri@digip.org>2012-02-12 19:06:57 (GMT)
commitc7551a16c7211301c51d15084894e0fed49fe086 (patch)
treef80a9650df997320f38c10d01e367cc397087f55 /Misc/ACKS
parent425b8e85a99ee0c21a6f805e123d90e35f9f6a9b (diff)
parent51d04d1ba8643d8a0c89d8307bf43697223f31e2 (diff)
downloadcpython-c7551a16c7211301c51d15084894e0fed49fe086.zip
cpython-c7551a16c7211301c51d15084894e0fed49fe086.tar.gz
cpython-c7551a16c7211301c51d15084894e0fed49fe086.tar.bz2
Merge branch '3.2'
Closes #9750
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 b38673b..a0f6f25 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -543,6 +543,7 @@ Lenny Kneler
Pat Knight
Greg Kochanski
Damon Kohler
+Marko Kohtala
Jacek Konieczny
Марк Коренберг
Arkady Koplyarov