]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Fri, 15 Apr 2016 23:47:15 +0000 (16:47 -0700)
committerGregory P. Smith <greg@krypto.org>
Fri, 15 Apr 2016 23:47:15 +0000 (16:47 -0700)

Trivial merge