]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Thu, 9 Jun 2011 11:14:12 +0000 (13:14 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 9 Jun 2011 11:14:12 +0000 (13:14 +0200)

Trivial merge