From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 3 Mar 2010 15:08:47 +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~42
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=631333651472a180e562efa70bcb8233c67beb22;p=kivitendo-erp.git

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

631333651472a180e562efa70bcb8233c67beb22