]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Thu, 9 Jun 2011 12:07:46 +0000 (14:07 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 9 Jun 2011 12:07:46 +0000 (14:07 +0200)

Trivial merge