[Python-checkins] cpython (merge 3.5 -> 3.5): final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads

[ned.deily]

https://hg.python.org/cpython/rev/8f395bdff416
changeset:   101667:8f395bdff416
branch:      3.5
parent:      101666:48469527e407
parent:      101659:d085b4f779af
user:        Ned Deily <nad at python.org>
date:        Fri Jun 03 15:20:13 2016 -0700
summary:
  final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads

files:



-- 
Repository URL: https://hg.python.org/cpython