Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
Conflicts:
bin/mozilla/cp.pl
Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
Conflicts: