From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 29 Dec 2010 09:51:38 +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~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=abd6359e164d3e7eaffd45a2549ee1e6c167f995;p=kivitendo-erp.git

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

abd6359e164d3e7eaffd45a2549ee1e6c167f995