]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 17:53:02 +0000 (19:53 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 12 Aug 2011 17:53:02 +0000 (19:53 +0200)

Trivial merge