From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 28 Dec 2010 14:16:17 +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~12
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=496d86f07a9421aa64bb78f369e5279f67924a3e;p=kivitendo-erp.git

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

496d86f07a9421aa64bb78f369e5279f67924a3e