]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 22 Jun 2012 19:13:34 +0000 (21:13 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 22 Jun 2012 19:13:34 +0000 (21:13 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge