]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 21 Sep 2011 14:36:08 +0000 (16:36 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 21 Sep 2011 14:36:08 +0000 (16:36 +0200)

Trivial merge