]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sat, 4 Jun 2011 18:37:16 +0000 (20:37 +0200)
committerÉric Araujo <merwok@netwok.org>
Sat, 4 Jun 2011 18:37:16 +0000 (20:37 +0200)

Trivial merge