From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 13 Jan 2011 14:17:16 +0000 (+0100)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.2beta2~22
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f3288b9cb4e09eac31d5a80f22063606e9a7b75d;p=kivitendo-erp.git

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

f3288b9cb4e09eac31d5a80f22063606e9a7b75d