From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 27 Dec 2010 12:17:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~64^2~40
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8eb972fd373d0363cd3dc3cd6777c0d3f076111f;p=kivitendo-erp.git

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

8eb972fd373d0363cd3dc3cd6777c0d3f076111f