]> granicus.if.org Git - python/commitdiff
Fixed merge error.
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 4 Sep 2015 05:39:33 +0000 (08:39 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 4 Sep 2015 05:39:33 +0000 (08:39 +0300)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge