Merge branch 'master' into after-262
Conflicts: DEBIAN/DEBIAN/postinst DEBIAN/mk_erp_deb.sh config/lx-erp.conf config/lx-erp.conf.default doc/INSTALL.txt locale/de_DE/all
Merge branch 'master' into after-262
Conflicts:
DEBIAN/DEBIAN/postinst
DEBIAN/mk_erp_deb.sh
config/lx-erp.conf
config/lx-erp.conf.default
doc/INSTALL.txt
locale/de_DE/all