]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 25 Mar 2011 23:47:47 +0000 (00:47 +0100)
committerÉric Araujo <merwok@netwok.org>
Fri, 25 Mar 2011 23:47:47 +0000 (00:47 +0100)

Trivial merge