]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sun, 29 May 2011 15:56:20 +0000 (17:56 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 29 May 2011 15:56:20 +0000 (17:56 +0200)

Trivial merge