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

Trivial merge