Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 18 Nov 2011 16:25:05 +0000 (17:25 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 18 Nov 2011 16:25:05 +0000 (17:25 +0100)
commit554034c0587282b99d58cf42758b2f836367f2eb
treebd2eee1d81cd1416b530f621fad9a0dc681681c6
parentf99ef184147e99c2021281e41bd3c920414d8254
parentdfb76ebf04df9aed8ba63d7b51bc558d2928030e
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

Conflicts:
doc/INSTALL.texi
doc/INSTALL.txt
doc/INSTALL.html
doc/INSTALL.texi
doc/INSTALL.txt
doc/Lx-Office_Installation_DE.pdf