]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Tue, 12 Apr 2016 05:52:22 +0000 (07:52 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 12 Apr 2016 05:52:22 +0000 (07:52 +0200)

Trivial merge