]> granicus.if.org Git - python/commitdiff
Trunk merge.
authorBarry Warsaw <barry@python.org>
Mon, 1 Dec 2014 23:17:29 +0000 (18:17 -0500)
committerBarry Warsaw <barry@python.org>
Mon, 1 Dec 2014 23:17:29 +0000 (18:17 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge