]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 29 Sep 2012 18:57:40 +0000 (11:57 -0700)
committerGregory P. Smith <greg@krypto.org>
Sat, 29 Sep 2012 18:57:40 +0000 (11:57 -0700)

Trivial merge