]> granicus.if.org Git - python/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Fri, 21 Oct 2016 05:39:39 +0000 (22:39 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 21 Oct 2016 05:39:39 +0000 (22:39 -0700)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge