]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-Francois Natali <cf.natali@gmail.com>
Wed, 1 May 2013 13:15:50 +0000 (15:15 +0200)
committerCharles-Francois Natali <cf.natali@gmail.com>
Wed, 1 May 2013 13:15:50 +0000 (15:15 +0200)

Trivial merge