]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Fri, 14 Oct 2011 15:38:10 +0000 (17:38 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 14 Oct 2011 15:38:10 +0000 (17:38 +0200)

Trivial merge