]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:49:59 +0000 (16:49 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:49:59 +0000 (16:49 +0200)

Trivial merge