From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 12 Oct 2011 14:44:44 +0000 (+0200)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~230^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=debd14edcc23a6168e827be861a052f396aee901;p=kivitendo-erp.git

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

debd14edcc23a6168e827be861a052f396aee901