]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Mon, 14 Apr 2014 20:32:35 +0000 (13:32 -0700)
committerGregory P. Smith <greg@krypto.org>
Mon, 14 Apr 2014 20:32:35 +0000 (13:32 -0700)

Trivial merge