Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 16 Jan 2012 14:46:34 +0000 (15:46 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 16 Jan 2012 14:46:34 +0000 (15:46 +0100)
commitdb9117394fe3be8279ab1becdb2b71d0de885063
tree0b241eb61bd641ec6587d9a878a6b521eeae6346
parent5a925d70b2984371dc5b652412c532966e0bb612
parent13e846f67ca70bf560939ca604999530bd97ba92
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp