From: Niclas Zimmermann <niclas@lx-office-hosting.de>
Date: Thu, 13 Sep 2012 12:49:02 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~238
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ffac48200e07de28e9efcb20c668ba3f1e3ed12e;p=kivitendo-erp.git

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

ffac48200e07de28e9efcb20c668ba3f1e3ed12e