]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2017 08:05:47 +0000 (00:05 -0800)
committerBenjamin Peterson <benjamin@python.org>
Mon, 16 Jan 2017 08:05:47 +0000 (00:05 -0800)

Trivial merge