]> granicus.if.org Git - python/commitdiff
merge 2.7.12 release branch
authorBenjamin Peterson <benjamin@python.org>
Sat, 25 Jun 2016 21:04:11 +0000 (14:04 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 25 Jun 2016 21:04:11 +0000 (14:04 -0700)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge