Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 12 Oct 2012 15:35:16 +0000 (17:35 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 12 Oct 2012 15:35:16 +0000 (17:35 +0200)
commitc42acfd52669057debdf6a3d4245492ef23384b7
tree65771211a9ddace4a882c00588ddf6aa6f0d6800
parent51323d9abf9834bee661fc17eb4a192182509c2f
parent55036afce77af5cdd81713edd0f027b6a3bd76d2
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
config/kivitendo.conf.default