]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorVictor Stinner <victor.stinner@gmail.com>
Fri, 11 Jul 2014 21:48:10 +0000 (23:48 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Fri, 11 Jul 2014 21:48:10 +0000 (23:48 +0200)

Trivial merge