Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorC. Braun <information@lx-office-hosting.de>
Fri, 13 May 2011 13:46:47 +0000 (15:46 +0200)
committerC. Braun <information@lx-office-hosting.de>
Fri, 13 May 2011 13:46:47 +0000 (15:46 +0200)
commit915e943a8fa8ab2a32576d4609632d598898cf20
tree610320e9adf1b93075787864129724ed5a331b51
parent7b47939f9d44c2e4b9f7c56cc6a1fce2be1f41dc
parent27ae86579fb8833067e9d6c02cf5429d98b28449
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
config/lx_office.conf.default