]> granicus.if.org Git - python/commitdiff
merge
authorVictor Stinner <victor.stinner@haypocalc.com>
Mon, 21 Mar 2011 01:12:09 +0000 (02:12 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Mon, 21 Mar 2011 01:12:09 +0000 (02:12 +0100)

Trivial merge