]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.1
authorÉric Araujo <merwok@netwok.org>
Sun, 20 Mar 2011 17:32:51 +0000 (18:32 +0100)
committerÉric Araujo <merwok@netwok.org>
Sun, 20 Mar 2011 17:32:51 +0000 (18:32 +0100)

Trivial merge