]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sun, 29 May 2011 15:57:29 +0000 (17:57 +0200)
committerÉric Araujo <merwok@netwok.org>
Sun, 29 May 2011 15:57:29 +0000 (17:57 +0200)

Trivial merge