]> granicus.if.org Git - python/commitdiff
merge with 3.5
authorGeorg Brandl <georg@python.org>
Wed, 15 Jun 2016 06:58:46 +0000 (08:58 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 15 Jun 2016 06:58:46 +0000 (08:58 +0200)
1  2 
Doc/Makefile

diff --cc Doc/Makefile
Simple merge