From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 29 Dec 2010 15:06:32 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~42^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=962741693df01b4a277b1611dfc40c6fe7b24464;p=kivitendo-erp.git

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

962741693df01b4a277b1611dfc40c6fe7b24464