From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 24 Jan 2011 15:15:07 +0000 (+0100)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.2~29
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1afeb79d3815487fa4b0a021e9de3b198417f453;p=kivitendo-erp.git

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

1afeb79d3815487fa4b0a021e9de3b198417f453