]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Mon, 13 Oct 2014 18:32:38 +0000 (19:32 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Mon, 13 Oct 2014 18:32:38 +0000 (19:32 +0100)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge