]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 14 Sep 2016 05:46:45 +0000 (22:46 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 14 Sep 2016 05:46:45 +0000 (22:46 -0700)

Trivial merge