]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge branch '3.2'
authorPetri Lehtinen <petri@digip.org>
Tue, 22 May 2012 18:05:30 +0000 (21:05 +0300)
committerPetri Lehtinen <petri@digip.org>
Tue, 22 May 2012 18:05:30 +0000 (21:05 +0300)

Trivial merge