]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Thu, 6 Oct 2011 11:19:34 +0000 (13:19 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 6 Oct 2011 11:19:34 +0000 (13:19 +0200)

Trivial merge