From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 19 Jun 2012 13:59:40 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~329
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=dfeaf8fb10513660b70b48b155436277f5d1266b;p=kivitendo-erp.git

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

dfeaf8fb10513660b70b48b155436277f5d1266b