]> granicus.if.org Git - python/commitdiff
Merge heads
authorPetri Lehtinen <petri@digip.org>
Fri, 4 Nov 2011 20:36:54 +0000 (22:36 +0200)
committerPetri Lehtinen <petri@digip.org>
Fri, 4 Nov 2011 20:36:56 +0000 (22:36 +0200)

Trivial merge