]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Fri, 15 Apr 2016 23:51:02 +0000 (16:51 -0700)
committerGregory P. Smith <greg@krypto.org>
Fri, 15 Apr 2016 23:51:02 +0000 (16:51 -0700)

Trivial merge