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

Trivial merge