summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-04-13 16:08:55 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-04-13 16:08:55 (GMT)
commit0b1e4f1427b2cf30de8cae48fe1fd3791e489072 (patch)
treef6815987e0e298ba17832e46d869cf7687320084 /Misc
parent7dfa094e78dd3bc6c996587d3ad966af0620d0ec (diff)
parentbb5dbf840c3396488f68bf7c40ad868ba40dca99 (diff)
downloadcpython-0b1e4f1427b2cf30de8cae48fe1fd3791e489072.zip
cpython-0b1e4f1427b2cf30de8cae48fe1fd3791e489072.tar.gz
cpython-0b1e4f1427b2cf30de8cae48fe1fd3791e489072.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 6e24cc9..9a3de4e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -351,6 +351,7 @@ Robert Donohue
Marcos Donolo
Dima Dorfman
Yves Dorfsman
+Michael Dorman
Cesar Douady
Dean Draayer
Fred L. Drake, Jr.