]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Mon, 8 Aug 2011 14:56:46 +0000 (16:56 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 8 Aug 2011 14:56:46 +0000 (16:56 +0200)

Trivial merge