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

Trivial merge