]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorVictor Stinner <victor.stinner@gmail.com>
Sat, 25 Jul 2015 00:43:31 +0000 (02:43 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sat, 25 Jul 2015 00:43:31 +0000 (02:43 +0200)

Trivial merge