]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 13 Sep 2016 05:09:52 +0000 (22:09 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 13 Sep 2016 05:09:52 +0000 (22:09 -0700)

Trivial merge