summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-10-27 10:56:30 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-10-27 10:56:30 (GMT)
commit969684f2ad340cdfe1c46ba5b40b6668aca1b52b (patch)
tree97126e9f978669f0353aabe298b3738db9ec1f20 /Misc/ACKS
parent5979fdf548677a8a6ecc45542f6df640c10d2096 (diff)
parent254af2644a90bcabbe2612950dd2a6ef408337be (diff)
downloadcpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.zip
cpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.tar.gz
cpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.tar.bz2
Merge 3.3
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 110fa58..f6030a4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -594,6 +594,7 @@ Jan Kaliszewski
Peter van Kampen
Rafe Kaplan
Jacob Kaplan-Moss
+Janne Karila
Per Øyvind Karlsen
Lou Kates
Hiroaki Kawai