summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-06-17 12:12:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-06-17 12:12:42 (GMT)
commit5b1406fbceb40c3d042c7b56c30d640b70a1134a (patch)
treefee0db44119c5dd378da0ecf2dc2aeb2dcce3244 /Misc
parent307ef8aee5a79095d7088a60615a46260d159a98 (diff)
parentf90ea1f0a0e258deb7211ce6736f050ce4f22ae2 (diff)
downloadcpython-5b1406fbceb40c3d042c7b56c30d640b70a1134a.zip
cpython-5b1406fbceb40c3d042c7b56c30d640b70a1134a.tar.gz
cpython-5b1406fbceb40c3d042c7b56c30d640b70a1134a.tar.bz2
#14840: merge with 3.2.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b89493b..a933f73 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1092,6 +1092,7 @@ Larry Wall
Kevin Walzer
Rodrigo Steinmuller Wanderley
Greg Ward
+Zachary Ware
Barry Warsaw
Steve Waterbury
Bob Watson