]> granicus.if.org Git - python/commitdiff
merge
authorVictor Stinner <victor.stinner@haypocalc.com>
Sun, 20 Mar 2011 22:25:25 +0000 (23:25 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Sun, 20 Mar 2011 22:25:25 +0000 (23:25 +0100)

Trivial merge