Fix conflicts
[claws.git] / manual / pl / claws-mail-manual.xml
2006-11-07 Colin Leroy2006-11-07 [paul] 2.6.0cvs7