From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 20 Jun 2011 15:54:35 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.7.0beta1~378
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d74347f965b920e837d28ae0d7c78135a2f447a3;p=kivitendo-erp.git

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

d74347f965b920e837d28ae0d7c78135a2f447a3