Merge branch 'master' into after-262
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 1 Feb 2011 13:41:27 +0000 (14:41 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 1 Feb 2011 13:41:27 +0000 (14:41 +0100)
commite055700faea1906bea6c03184ba4516b57cac887
treedfcdeee72d37ed3a65b0e5fa28bb247ccc1ba48d
parent1072cd08c6f5b1905a34dcb3eeab3ddec98d6905
parentee5544b2f861fefe3520ac20ec2e221516069f95
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
15 files changed:
DEBIAN/DEBIAN/postinst
DEBIAN/mk_erp_deb.sh
SL/DB/Object.pm
SL/Dispatcher.pm
SL/Form.pm
SL/IS.pm
SL/Template/LaTeX.pm
bin/mozilla/do.pl
bin/mozilla/wh.pl
doc/INSTALL.texi
doc/INSTALL.txt
doc/INSTALL/Datenbanken-anlegen.html
doc/INSTALL/OpenDocument_002dVorlagen.html
locale/de/all
locale/de_DE/all