]> granicus.if.org Git - python/commitdiff
merged
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 9 May 2011 05:42:48 +0000 (07:42 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 9 May 2011 05:42:48 +0000 (07:42 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge