summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-10 16:34:05 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-10 16:34:05 (GMT)
commit161194a5d0b0785cefe9dde017707409a31ef712 (patch)
tree3b1ab3d8831e6e7b78b9e6e7781a0436dd370f23 /Misc/ACKS
parent3f5ffbee2323770399c9e80cf9c807dc21b3e009 (diff)
parentcd514cf175ef820fe62f7e201f596f930d4b1d02 (diff)
downloadcpython-161194a5d0b0785cefe9dde017707409a31ef712.zip
cpython-161194a5d0b0785cefe9dde017707409a31ef712.tar.gz
cpython-161194a5d0b0785cefe9dde017707409a31ef712.tar.bz2
#12820: 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 a29747b..9a4cb52 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -240,6 +240,7 @@ Paul Colomiets
Christophe Combelles
Geremy Condra
Denver Coneybeare
+Phil Connell
Juan José Conti
Matt Conway
David M. Cooke