]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sun, 8 Sep 2013 10:35:53 +0000 (12:35 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Sun, 8 Sep 2013 10:35:53 +0000 (12:35 +0200)

Trivial merge