]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sun, 25 Aug 2013 16:27:34 +0000 (18:27 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Sun, 25 Aug 2013 16:27:34 +0000 (18:27 +0200)

Trivial merge