]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 1 Jun 2011 17:47:06 +0000 (19:47 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 1 Jun 2011 17:47:06 +0000 (19:47 +0200)

Trivial merge