]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Mon, 6 Jun 2011 15:11:47 +0000 (17:11 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 6 Jun 2011 15:11:47 +0000 (17:11 +0200)

Trivial merge