]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:11:23 +0000 (14:11 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2011 19:11:23 +0000 (14:11 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge