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

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

f46dfda018cac3aeaa549d678ad036d0cfff2e6d