]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Thu, 25 Feb 2016 19:14:21 +0000 (20:14 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 25 Feb 2016 19:14:21 +0000 (20:14 +0100)

Trivial merge