]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 2 Jan 2013 15:37:33 +0000 (09:37 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 2 Jan 2013 15:37:33 +0000 (09:37 -0600)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge