]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Sun, 21 Aug 2011 10:54:06 +0000 (12:54 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 21 Aug 2011 10:54:06 +0000 (12:54 +0200)

Trivial merge