]> granicus.if.org Git - python/commitdiff
another merge
authorBrian Curtin <brian@python.org>
Thu, 27 Dec 2012 20:14:42 +0000 (14:14 -0600)
committerBrian Curtin <brian@python.org>
Thu, 27 Dec 2012 20:14:42 +0000 (14:14 -0600)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge