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

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

d14a38bbaa7fcd371998b43bf389f56908575c7c