summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-08-01 19:15:28 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2015-08-01 19:15:28 -0400
commit8efb76fb396eb68b1e8f97971599b8f9a4379f6a (patch)
tree3968b53df45db92ace0e9d63e9064f431fe4422d
parenteb803c8f9eac1cf2ddf18be84aec689ad99c0f1b (diff)
parentdba51b83783f256ce178b3abae58888c66d8b5ce (diff)
downloadcpython-git-8efb76fb396eb68b1e8f97971599b8f9a4379f6a.tar.gz
Merge with 3.5
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 38f826c6d0..702883fa3b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1196,6 +1196,7 @@ Armin Ronacher
Case Roole
Timothy Roscoe
Erik Rose
+Mark Roseman
Josh Rosenberg
Jim Roskind
Brian Rosner