Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 11 Apr 2011 12:47:16 +0000 (14:47 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 11 Apr 2011 12:47:16 +0000 (14:47 +0200)
commit7e50c2a50f8d5b67f47043aea48bf83a2b9253e6
tree110aaa2ab08424c95d3abc3b87682410d1d0d823
parent9ff6c771443e9fd76570a04796301e89fafb1384
parente07361d5aad83ac57aba98be21aa30c6de47aa9e
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp