]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:49:10 +0000 (02:49 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:49:10 +0000 (02:49 +0200)

Trivial merge