summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-09-30 19:39:05 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-09-30 19:39:05 (GMT)
commitb4b55eb582e5a7c71bac90030ab3c46b5cd6d429 (patch)
tree9e5e27db17ca0e839c70736ca4be6554efdcddb9 /Misc
parent0035be3fee832ebccd8c86576b9c604ca321cefa (diff)
parent30eee4deec169ff560bfbe130bab483d173ba35e (diff)
downloadcpython-b4b55eb582e5a7c71bac90030ab3c46b5cd6d429.zip
cpython-b4b55eb582e5a7c71bac90030ab3c46b5cd6d429.tar.gz
cpython-b4b55eb582e5a7c71bac90030ab3c46b5cd6d429.tar.bz2
Merge with 3.5
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 f55583b..d5eed57 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1621,6 +1621,7 @@ Truida Wiedijk
Felix Wiemann
Gerry Wiener
Frank Wierzbicki
+Mariatta Wijaya
Santoso Wijaya
Chris Wilcox
Bryce "Zooko" Wilcox-O'Hearn