From: Holger Lindemann <hli@lx-system.de>
Date: Fri, 5 Mar 2010 00:54:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~12^2^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=805ec79a9335179b0a3831874e606791ff027810;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

805ec79a9335179b0a3831874e606791ff027810