]> granicus.if.org Git - python/commitdiff
Merge heads
authorPetri Lehtinen <petri@digip.org>
Sat, 12 Nov 2011 19:23:28 +0000 (21:23 +0200)
committerPetri Lehtinen <petri@digip.org>
Sat, 12 Nov 2011 19:23:28 +0000 (21:23 +0200)

Trivial merge