]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 31 Aug 2011 13:34:34 +0000 (15:34 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 31 Aug 2011 13:34:34 +0000 (15:34 +0200)

Trivial merge