From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 28 Dec 2010 10:55:57 +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~51^2~9^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6a8787147ad643549eb26cb4f9a373b5b354b8b9;p=kivitendo-erp.git

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

6a8787147ad643549eb26cb4f9a373b5b354b8b9