]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 10 Dec 2014 16:05:35 +0000 (11:05 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 10 Dec 2014 16:05:35 +0000 (11:05 -0500)
1  2 
Doc/Makefile

diff --cc Doc/Makefile
Simple merge