]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Mon, 6 Jun 2011 15:13:08 +0000 (17:13 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 6 Jun 2011 15:13:08 +0000 (17:13 +0200)

Trivial merge