]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorPetri Lehtinen <petri@digip.org>
Sat, 5 Nov 2011 20:06:49 +0000 (22:06 +0200)
committerPetri Lehtinen <petri@digip.org>
Sat, 5 Nov 2011 20:07:38 +0000 (22:07 +0200)

Trivial merge