From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 4 Mar 2010 11:08:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~33^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9d3929fdc1cbdbed95645068b9de76144afe1b68;p=kivitendo-erp.git

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

9d3929fdc1cbdbed95645068b9de76144afe1b68