]> granicus.if.org Git - python/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Mon, 27 Jan 2014 06:28:06 +0000 (22:28 -0800)
committerLarry Hastings <larry@hastings.org>
Mon, 27 Jan 2014 06:28:06 +0000 (22:28 -0800)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge