Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 20 Apr 2012 14:08:00 +0000 (16:08 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 20 Apr 2012 14:08:00 +0000 (16:08 +0200)
commit5104dee447f25733832ed4e4a58c4847b2c2ea66
treec8c1404f0e740ebbbe0894d8547fa77601e66901
parent4070dbf38e04b168fe43bd3a6e5a3f28f77e986d
parent964590702994ec4787b68c028cd7d78edfe1bfa7
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp