]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Sun, 4 Sep 2011 23:56:11 +0000 (01:56 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 4 Sep 2011 23:56:11 +0000 (01:56 +0200)

Trivial merge