]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 17 Feb 2012 17:10:11 +0000 (18:10 +0100)
committerÉric Araujo <merwok@netwok.org>
Fri, 17 Feb 2012 17:10:11 +0000 (18:10 +0100)

Trivial merge