]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:19:20 +0000 (16:19 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:19:20 +0000 (16:19 +0200)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge