]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 17 Mar 2012 05:05:59 +0000 (00:05 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 17 Mar 2012 05:05:59 +0000 (00:05 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge