]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Mon, 1 Aug 2011 12:43:45 +0000 (14:43 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 1 Aug 2011 12:43:45 +0000 (14:43 +0200)

Trivial merge