]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 9 Aug 2011 21:16:33 +0000 (16:16 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 9 Aug 2011 21:16:33 +0000 (16:16 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge