]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 14 Oct 2011 14:56:02 +0000 (16:56 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 14 Oct 2011 14:56:02 +0000 (16:56 +0200)

Trivial merge