]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:34:11 +0000 (02:34 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 24 Apr 2011 00:34:11 +0000 (02:34 +0200)

Trivial merge