]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:47:37 +0000 (02:47 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:47:37 +0000 (02:47 +0200)

Trivial merge