]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sun, 12 Jun 2016 00:56:40 +0000 (17:56 -0700)
committerGregory P. Smith <greg@krypto.org>
Sun, 12 Jun 2016 00:56:40 +0000 (17:56 -0700)

Trivial merge