summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-07-23 19:13:09 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-07-23 19:13:09 (GMT)
commit4d9e903f7efdbe04a3463dc422c0b18f2c0b971d (patch)
tree6473fd66f8159c9f496dfc4bb2c53314124b8980 /Misc
parent9aab0beb71d1ab539291a0f0e3f8915661471dac (diff)
parent22084fc8ba8d1e585b9c837711d4d93af2378dc3 (diff)
downloadcpython-4d9e903f7efdbe04a3463dc422c0b18f2c0b971d.zip
cpython-4d9e903f7efdbe04a3463dc422c0b18f2c0b971d.tar.gz
cpython-4d9e903f7efdbe04a3463dc422c0b18f2c0b971d.tar.bz2
Merge heads
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 fa88c65..d9fed8a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -668,6 +668,7 @@ Kurt B. Kaiser
Tamito Kajiyama
Jan Kaliszewski
Peter van Kampen
+Jan Kanis
Rafe Kaplan
Jacob Kaplan-Moss
Janne Karila