]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:11:27 +0000 (21:11 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:11:27 +0000 (21:11 +0100)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge