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)
1  2 
config/lx_office.conf.default

Simple merge