From: Niclas Zimmermann <niclas@lx-office-hosting.de>
Date: Tue, 4 Sep 2012 15:15:33 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~251^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0499c65ed3ba3c3ac87b5aab9a60c3cc33be0796;p=kivitendo-erp.git

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

0499c65ed3ba3c3ac87b5aab9a60c3cc33be0796