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

Trivial merge