]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Mon, 8 Aug 2011 14:56:00 +0000 (16:56 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 8 Aug 2011 14:56:00 +0000 (16:56 +0200)

Trivial merge