From: Jan Büren <jan@lx-office-hosting.de>
Date: Mon, 19 Sep 2011 10:40:21 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.7.0beta1~281
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2e9687c8d57a1609e2936e30c3f97d9366fab61d;p=kivitendo-erp.git

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

2e9687c8d57a1609e2936e30c3f97d9366fab61d