]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorPetri Lehtinen <petri@digip.org>
Mon, 24 Oct 2011 18:29:20 +0000 (21:29 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 24 Oct 2011 18:29:20 +0000 (21:29 +0300)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge