summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-31 00:34:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-31 00:34:05 (GMT)
commitaa2d085d2951a7b5c7c81d30a2fdd333a2fa7145 (patch)
tree817aa4d661a163a2e5c27ba29dfa5aba43dd57da
parent0ad6098b67acd0b00754e0b6668cb93213cb32d2 (diff)
parent8aef28a5d03cee6da9c41885b40d36d7e1a9be79 (diff)
downloadcpython-aa2d085d2951a7b5c7c81d30a2fdd333a2fa7145.zip
cpython-aa2d085d2951a7b5c7c81d30a2fdd333a2fa7145.tar.gz
cpython-aa2d085d2951a7b5c7c81d30a2fdd333a2fa7145.tar.bz2
merge 3.2
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index aa1add2..2f3a4d1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -95,6 +95,7 @@ Neal Becker
Robin Becker
Torsten Becker
Bill Bedford
+Ian Beer
Stefan Behnel
Reimer Behrends
Ben Bell