summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-05-07 06:47:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-05-07 06:47:08 (GMT)
commit7168879eb247545944568dc38fcc9c26a5e5ca30 (patch)
tree758cfe4680ca27263349ad59c9a1f7e500dc1ecc /Misc/ACKS
parent6e6bee8d084eb4693e73d55465de6a63d07009b4 (diff)
parent9c939bceeb0074bfc177041daaee75d8da5d1676 (diff)
downloadcpython-7168879eb247545944568dc38fcc9c26a5e5ca30.zip
cpython-7168879eb247545944568dc38fcc9c26a5e5ca30.tar.gz
cpython-7168879eb247545944568dc38fcc9c26a5e5ca30.tar.bz2
#17871: merge with 3.3.
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 b8172b6..12c81f9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -208,6 +208,7 @@ Godefroid Chapelle
Brad Chapman
Greg Chapman
Mitch Chapman
+Yogesh Chaudhari
David Chaum
Nicolas Chauvat
Jerry Chen