]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Wed, 2 May 2012 18:51:59 +0000 (20:51 +0200)
committerCharles-François Natali <neologix@free.fr>
Wed, 2 May 2012 18:51:59 +0000 (20:51 +0200)

Trivial merge