]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorRonald Oussoren <ronaldoussoren@mac.com>
Fri, 6 May 2011 15:11:44 +0000 (17:11 +0200)
committerRonald Oussoren <ronaldoussoren@mac.com>
Fri, 6 May 2011 15:11:44 +0000 (17:11 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge