]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sat, 31 Aug 2013 15:32:30 +0000 (17:32 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Sat, 31 Aug 2013 15:32:30 +0000 (17:32 +0200)

Trivial merge