From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 5 Mar 2010 14:26:35 +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~12^2~2^2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=79783496069e3112eab9c74cf6060cd46a3ee6d3;p=kivitendo-erp.git

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

79783496069e3112eab9c74cf6060cd46a3ee6d3