]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Thu, 2 Feb 2012 19:36:47 +0000 (20:36 +0100)
committerCharles-François Natali <neologix@free.fr>
Thu, 2 Feb 2012 19:36:47 +0000 (20:36 +0100)

Trivial merge