]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads
authorNed Deily <nad@python.org>
Fri, 3 Jun 2016 22:20:13 +0000 (15:20 -0700)
committerNed Deily <nad@python.org>
Fri, 3 Jun 2016 22:20:13 +0000 (15:20 -0700)

Trivial merge