Fix conflicts
[claws.git] / manual / dist / Makefile.am
2006-01-20 Colin Leroyforgot these! :)