[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Sun Aug 2 01:16:04 CEST 2015

https://hg.python.org/cpython/rev/05cbe6544707
changeset: 97191:05cbe6544707
parent: 97188:3a731756f9cc
parent: 97190:bf14b74d6fc0
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Aug 01 19:15:28 2015 -0400
summary:
 Merge with 3.5
files:
 Misc/ACKS | 1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1196,6 +1196,7 @@
 Case Roole
 Timothy Roscoe
 Erik Rose
+Mark Roseman
 Josh Rosenberg
 Jim Roskind
 Brian Rosner
-- 
Repository URL: https://hg.python.org/cpython
