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

Trivial merge