]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 15:40:25 +0000 (17:40 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 15:40:25 +0000 (17:40 +0200)

Trivial merge