From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 10 Dec 2010 10:57:21 +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~73
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a111d6e8e4071fd81d7406e7f3849d6ad28726fd;p=kivitendo-erp.git

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

a111d6e8e4071fd81d7406e7f3849d6ad28726fd