forked from Wavyzz/dolibarr
Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/filefunc.inc.php htdocs/langs/nl_NL/margins.lang