Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 20 Sep 2011 17:33:55 +0000 (19:33 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 20 Sep 2011 17:33:55 +0000 (19:33 +0200)
commit159556ca90d5aa0662964ea5f2db8f8f3a716ea8
treec4f36707800a62cf85a38cf7d8bf09ca4c1439c3
parent590bb2353295daa2eaa72b0fbe8ca2cc246a5860
parent9c228f168c91f538bd70278a481462618a782e0b
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp