]> granicus.if.org Git - python/commitdiff
merge
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 30 Apr 2012 03:24:04 +0000 (05:24 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 30 Apr 2012 03:24:04 +0000 (05:24 +0200)

Trivial merge