Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 2 Jan 2012 14:10:57 +0000 (15:10 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 2 Jan 2012 14:10:57 +0000 (15:10 +0100)
commit55170a93996275faa91ca6efd6d0dfb385ab4bd4
tree8b46cb1f634c5afbb1b637eeac472b91b3ba9b26
parentad4bfe6755ebd27d30c93e5f061616bb3b27b861
parentf94c0c4a41044237f839e62d10348f84ba61c2c4
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp