]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>
Thu, 8 Sep 2016 00:46:58 +0000 (00:46 +0000)
committerGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>
Thu, 8 Sep 2016 00:46:58 +0000 (00:46 +0000)

Trivial merge