]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Mon, 13 Oct 2014 17:42:49 +0000 (18:42 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Mon, 13 Oct 2014 17:42:49 +0000 (18:42 +0100)

Trivial merge