]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Tue, 23 Aug 2011 19:41:03 +0000 (21:41 +0200)
committerÉric Araujo <merwok@netwok.org>
Tue, 23 Aug 2011 19:41:03 +0000 (21:41 +0200)

Trivial merge