]> granicus.if.org Git - python/commitdiff
Merge heads.
authorLarry Hastings <larry@hastings.org>
Mon, 7 Sep 2015 12:16:38 +0000 (05:16 -0700)
committerLarry Hastings <larry@hastings.org>
Mon, 7 Sep 2015 12:16:38 +0000 (05:16 -0700)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge