]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 4 Nov 2015 06:42:08 +0000 (22:42 -0800)
committerBenjamin Peterson <benjamin@python.org>
Wed, 4 Nov 2015 06:42:08 +0000 (22:42 -0800)
1  2 
Doc/install/index.rst

Simple merge