]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 18:06:07 +0000 (14:06 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 18:06:07 +0000 (14:06 -0400)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge