summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-12 16:28:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-12 16:28:51 (GMT)
commit6645f7e59022c7a30ef396c3e1851f92b974afe8 (patch)
tree20d404e5ef82114248b9250236a96013f74feb80 /Misc
parent09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410 (diff)
parente976fc74647f679519edde2a1e0b73ff711e079b (diff)
downloadcpython-6645f7e59022c7a30ef396c3e1851f92b974afe8.zip
cpython-6645f7e59022c7a30ef396c3e1851f92b974afe8.tar.gz
cpython-6645f7e59022c7a30ef396c3e1851f92b974afe8.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 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ć