]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 28 Aug 2012 22:02:18 +0000 (18:02 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 28 Aug 2012 22:02:18 +0000 (18:02 -0400)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge