]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Fri, 20 Jun 2014 21:41:46 +0000 (22:41 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Fri, 20 Jun 2014 21:41:46 +0000 (22:41 +0100)

Trivial merge