]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:34:51 +0000 (14:34 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:34:51 +0000 (14:34 +0200)

Trivial merge