From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 29 Dec 2010 11:40:05 +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~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9cba1f95c05194fe2258d44a966c2736867f26ef;p=kivitendo-erp.git

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

9cba1f95c05194fe2258d44a966c2736867f26ef