]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Fri, 26 Feb 2016 18:16:43 +0000 (19:16 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 26 Feb 2016 18:16:43 +0000 (19:16 +0100)

Trivial merge