]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sat, 7 Dec 2013 19:30:41 +0000 (20:30 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Sat, 7 Dec 2013 19:30:41 +0000 (20:30 +0100)

Trivial merge