]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorPetri Lehtinen <petri@digip.org>
Tue, 26 Jun 2012 07:26:53 +0000 (10:26 +0300)
committerPetri Lehtinen <petri@digip.org>
Tue, 26 Jun 2012 07:26:53 +0000 (10:26 +0300)

Trivial merge