summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-10 17:32:07 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-10 17:32:07 (GMT)
commit49aaad3c476abe77e9d90d20a7622fa5b1f5c38c (patch)
tree79b640803d65f31895f0ce8009c785b4ddb836c1 /Misc/ACKS
parentae10b3201cbed5fb181757f2ef80f9cd7c1fff45 (diff)
parentdf55334d52ba297e8bba4fd267fde68f48256e1c (diff)
downloadcpython-49aaad3c476abe77e9d90d20a7622fa5b1f5c38c.zip
cpython-49aaad3c476abe77e9d90d20a7622fa5b1f5c38c.tar.gz
cpython-49aaad3c476abe77e9d90d20a7622fa5b1f5c38c.tar.bz2
merge heads
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 3cf269b..8b3055c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -550,6 +550,7 @@ Joerg Lehmann
Robert Lehmann
Petri Lehtinen
Luke Kenneth Casson Leighton
+Tshepang Lekhonkhobe
Marc-Andre Lemburg
John Lenton
Christopher Tur Lesniewski-Laas