]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sat, 3 Nov 2012 21:10:01 +0000 (17:10 -0400)
committerÉric Araujo <merwok@netwok.org>
Sat, 3 Nov 2012 21:10:01 +0000 (17:10 -0400)

Trivial merge