]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:08:44 +0000 (22:08 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:08:44 +0000 (22:08 -0600)
1  2 
README

diff --cc README
Simple merge