]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 1 Jun 2011 17:39:27 +0000 (19:39 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 1 Jun 2011 17:39:27 +0000 (19:39 +0200)

Trivial merge