summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-14 02:28:16 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-14 02:28:16 (GMT)
commit156285c35f8ff856883f09394653b000331e3e33 (patch)
tree76fe7455051296fdbb57ced15fb20ec7d321c4ce /Misc/ACKS
parentf5c34054f9ea1fbdaeafdcf1a6f17f64f4dfed63 (diff)
parent99b5afab74428e5ddfd877bdf3aa8a8c479696b1 (diff)
downloadcpython-156285c35f8ff856883f09394653b000331e3e33.zip
cpython-156285c35f8ff856883f09394653b000331e3e33.tar.gz
cpython-156285c35f8ff856883f09394653b000331e3e33.tar.bz2
merge 3.2
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 2f3a4d1..ec961e4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1313,6 +1313,7 @@ Johannes Vogel
Alex Volkov
Martijn Vries
Sjoerd de Vries
+Guido Vranken
Niki W. Waibel
Wojtek Walczak
Charles Waldman