]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Thu, 29 Aug 2013 17:26:12 +0000 (19:26 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Thu, 29 Aug 2013 17:26:12 +0000 (19:26 +0200)

Trivial merge