summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-04-29 04:32:17 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-04-29 04:32:17 (GMT)
commitc763807d9bed84aeeb737c0e8ea1c238d59c99b6 (patch)
treedffaefe5f668d29b6b91d3e17da5b3806f950319 /Misc
parent7971286b6e5a022103b5ee646086686cd37a1e7d (diff)
parent43e7cd38e50a0f63362768e3009ba515c8a475d7 (diff)
downloadcpython-c763807d9bed84aeeb737c0e8ea1c238d59c99b6.zip
cpython-c763807d9bed84aeeb737c0e8ea1c238d59c99b6.tar.gz
cpython-c763807d9bed84aeeb737c0e8ea1c238d59c99b6.tar.bz2
Merge with 3.4
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 2aa087e..64b701f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1427,6 +1427,7 @@ Gerald S. Williams
Jason Williams
John Williams
Sue Williams
+Carol Willing
Steven Willis
Frank Willison
Geoff Wilson