summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-31 00:34:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-31 00:34:30 (GMT)
commita8768336d0f9db8d516c84450249c71dac540e85 (patch)
treed1610646c3a565c391a1afcee2530869367728f7
parent00ced0f4c7982f1dd181cd69a1e57e408a15edf9 (diff)
parentf5bdfda2709ab5492ae0b306d5ff706777e6cdb5 (diff)
downloadcpython-a8768336d0f9db8d516c84450249c71dac540e85.zip
cpython-a8768336d0f9db8d516c84450249c71dac540e85.tar.gz
cpython-a8768336d0f9db8d516c84450249c71dac540e85.tar.bz2
merge 3.4
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0eb8267..f1ed07c 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