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

Trivial merge