]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:23:13 +0000 (14:23 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:23:13 +0000 (14:23 +0200)

Trivial merge