]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Thu, 26 Jan 2012 23:36:08 +0000 (18:36 -0500)
committerBrett Cannon <brett@python.org>
Thu, 26 Jan 2012 23:36:08 +0000 (18:36 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge