]> granicus.if.org Git - python/commitdiff
merge 2.7.11 branch
authorBenjamin Peterson <benjamin@python.org>
Sat, 5 Dec 2015 08:18:11 +0000 (00:18 -0800)
committerBenjamin Peterson <benjamin@python.org>
Sat, 5 Dec 2015 08:18:11 +0000 (00:18 -0800)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge