]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Tue, 4 Oct 2011 21:37:43 +0000 (23:37 +0200)
committerCharles-François Natali <neologix@free.fr>
Tue, 4 Oct 2011 21:37:43 +0000 (23:37 +0200)

Trivial merge