summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEric V. Smith <eric@trueblade.com>2012-03-12 05:47:07 (GMT)
committerEric V. Smith <eric@trueblade.com>2012-03-12 05:47:07 (GMT)
commite976fc74647f679519edde2a1e0b73ff711e079b (patch)
treeebdc63e2bc33b673ed894e4b9aa15f660897440e /Misc
parent68e994e9e4a30fd3195b6cca46ff057f43021fc8 (diff)
parent851cad76164bb8ebc84937bfd14a7ea00e4911bc (diff)
downloadcpython-e976fc74647f679519edde2a1e0b73ff711e079b.zip
cpython-e976fc74647f679519edde2a1e0b73ff711e079b.tar.gz
cpython-e976fc74647f679519edde2a1e0b73ff711e079b.tar.bz2
Merge.
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 17ea919..49efa29 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -559,6 +559,7 @@ Holger Krekel
Michael Kremer
Fabian Kreutz
Cédric Krier
+Pedro Kroger
Hannu Krosing
Andrej Krpic
Ivan Krstić