]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <neologix@free.fr>
Sun, 20 May 2012 09:43:28 +0000 (11:43 +0200)
committerCharles-François Natali <neologix@free.fr>
Sun, 20 May 2012 09:43:28 +0000 (11:43 +0200)

Trivial merge