]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorVictor Stinner <victor.stinner@gmail.com>
Sat, 12 Jul 2014 01:20:40 +0000 (03:20 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sat, 12 Jul 2014 01:20:40 +0000 (03:20 +0200)

Trivial merge