]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Tue, 2 Aug 2011 18:01:54 +0000 (20:01 +0200)
committerÉric Araujo <merwok@netwok.org>
Tue, 2 Aug 2011 18:01:54 +0000 (20:01 +0200)

Trivial merge