]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Fri, 19 Feb 2016 07:57:50 +0000 (08:57 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 19 Feb 2016 07:57:50 +0000 (08:57 +0100)

Trivial merge