Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 29 Jun 2012 10:36:32 +0000 (12:36 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 29 Jun 2012 10:36:32 +0000 (12:36 +0200)
commit1085fcebcf6bb39790162b89f3a9e59d00446d00
tree182786af7d0748a3caabf380e1dfdcf5263dc8d7
parent37eb6908b96fb01c90a7130ff8453926a337876f
parent554ef802462a140ea769b8c3a7c7fc3ac91a58c4
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp