]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Sun, 28 Feb 2016 20:13:44 +0000 (21:13 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 28 Feb 2016 20:13:44 +0000 (21:13 +0100)

Trivial merge