From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 4 Mar 2010 09:22:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~36
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=61c893cd56f13b314ad0491873f6f197eaf6987f;p=kivitendo-erp.git

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

61c893cd56f13b314ad0491873f6f197eaf6987f