]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Thu, 16 Feb 2012 18:54:48 +0000 (19:54 +0100)
committerCharles-François Natali <neologix@free.fr>
Thu, 16 Feb 2012 18:54:48 +0000 (19:54 +0100)

Trivial merge