Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
Conflicts: doc/html/ch03s02.html doc/html/ch04.html doc/html/index.html doc/kivitendo-Dokumentation.pdf
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
Conflicts:
doc/html/ch03s02.html
doc/html/ch04.html
doc/html/index.html
doc/kivitendo-Dokumentation.pdf