]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 19 Aug 2011 00:26:44 +0000 (02:26 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 19 Aug 2011 00:26:44 +0000 (02:26 +0200)

Trivial merge