]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 14 May 2014 21:37:14 +0000 (23:37 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 14 May 2014 21:37:14 +0000 (23:37 +0200)

Trivial merge