From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 29 Dec 2010 10:21:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~42^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=738c240ad3a167dd3013ef01f0892b5589fd7d9a;p=kivitendo-erp.git

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

738c240ad3a167dd3013ef01f0892b5589fd7d9a