summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-30 20:34:20 -0400
committerBenjamin Peterson <benjamin@python.org>2014-03-30 20:34:20 -0400
commitf5bdfda2709ab5492ae0b306d5ff706777e6cdb5 (patch)
tree915c7c9fe17902a6c177078dd4935a6385e72424
parentd455ce4fd4078f1561ec0959dccd5b6561e4d3f6 (diff)
parentaa2d085d2951a7b5c7c81d30a2fdd333a2fa7145 (diff)
downloadcpython-git-f5bdfda2709ab5492ae0b306d5ff706777e6cdb5.tar.gz
merge 3.3
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0eb826715a..f1ed07c0e7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -96,6 +96,7 @@ Neal Becker
Robin Becker
Torsten Becker
Bill Bedford
+Ian Beer
Stefan Behnel
Reimer Behrends
Ben Bell