]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 20 Apr 2016 16:26:40 +0000 (18:26 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 20 Apr 2016 16:26:40 +0000 (18:26 +0200)

Trivial merge