]> wagnertech.de Git - mfinanz.git/commitdiff
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)
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


No differences found