]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:51:18 +0000 (16:51 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:51:18 +0000 (16:51 +0200)

Trivial merge