]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 17:53:13 +0000 (19:53 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 17:53:13 +0000 (19:53 +0200)

Trivial merge