From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 3 Apr 2012 14:26:45 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~344^2~6^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=954b24d2ef8c7f72da0af3637035c83f8ebdfc0d;hp=--cc;p=kivitendo-erp.git

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

954b24d2ef8c7f72da0af3637035c83f8ebdfc0d