summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-01 19:16:51 -0500
committerBenjamin Peterson <benjamin@python.org>2014-03-01 19:16:51 -0500
commit150570a573cb0e5d0ca5d1ae1d59c99e97689d96 (patch)
tree243f45c88ae0e3607e8ac45e3528f2d979118d65
parent24a945cc6b5ab24854e10fc519877099b38443c3 (diff)
parent9e90b12bb255de186400a8576c784c4443963876 (diff)
downloadcpython-git-150570a573cb0e5d0ca5d1ae1d59c99e97689d96.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 14a8cb84ef..dbf83e67a7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -40,6 +40,7 @@ Erik Andersén
Oliver Andrich
Ross Andrus
Juancarlo Añez
+Chris Angelico
Jérémy Anger
Ankur Ankan
Jon Anglin