Fix conflicts
[claws.git] / claws-mail.desktop
2007-03-21 Colin Leroy2007-03-21 [colin] 2.8.1cvs35
2006-11-07 Colin Leroyadd missing file