From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 4 Jan 2011 10:23:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=03f1746e7d974eb76926b4d5de041223f23ec615;p=kivitendo-erp.git

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

03f1746e7d974eb76926b4d5de041223f23ec615