]> granicus.if.org Git - python/commitdiff
Branch merge.
authorGeorg Brandl <georg@python.org>
Sun, 15 May 2011 08:42:56 +0000 (10:42 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 15 May 2011 08:42:56 +0000 (10:42 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge