]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 10 Feb 2013 14:32:22 +0000 (09:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 10 Feb 2013 14:32:22 +0000 (09:32 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge