]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:07 +0000 (22:09 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:07 +0000 (22:09 -0600)

Trivial merge