]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Mon, 16 Dec 2013 11:03:05 +0000 (12:03 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Mon, 16 Dec 2013 11:03:05 +0000 (12:03 +0100)

Trivial merge