]> granicus.if.org Git - python/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Sun, 18 May 2014 04:05:10 +0000 (21:05 -0700)
committerLarry Hastings <larry@hastings.org>
Sun, 18 May 2014 04:05:10 +0000 (21:05 -0700)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge