]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 4 Oct 2016 07:01:03 +0000 (00:01 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 4 Oct 2016 07:01:03 +0000 (00:01 -0700)

Trivial merge