]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Fri, 3 Jun 2011 10:57:49 +0000 (12:57 +0200)
committerCharles-François Natali <neologix@free.fr>
Fri, 3 Jun 2011 10:57:49 +0000 (12:57 +0200)

Trivial merge