]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Tue, 19 Mar 2013 22:07:22 +0000 (15:07 -0700)
committerGregory P. Smith <greg@krypto.org>
Tue, 19 Mar 2013 22:07:22 +0000 (15:07 -0700)

Trivial merge