]> granicus.if.org Git - python/commitdiff
merge heads
authorPetri Lehtinen <petri@digip.org>
Mon, 24 Oct 2011 18:24:58 +0000 (21:24 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 24 Oct 2011 18:24:58 +0000 (21:24 +0300)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge