forked from Wavyzz/dolibarr
Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php