]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 17 May 2011 23:32:26 +0000 (18:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 17 May 2011 23:32:26 +0000 (18:32 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge