Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
Conflicts: doc/changelog
Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
Conflicts:
doc/changelog