]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:12:22 +0000 (18:12 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:12:22 +0000 (18:12 +0200)

Trivial merge