]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 7 Mar 2012 20:50:35 +0000 (14:50 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 7 Mar 2012 20:50:35 +0000 (14:50 -0600)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge