Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
Conflicts: doc/INSTALL.texi doc/INSTALL.txt
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
Conflicts:
doc/INSTALL.texi
doc/INSTALL.txt