]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Sat, 14 Jan 2012 10:53:37 +0000 (11:53 +0100)
committerCharles-François Natali <neologix@free.fr>
Sat, 14 Jan 2012 10:53:37 +0000 (11:53 +0100)

Trivial merge