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

Trivial merge