From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 7 Mar 2011 12:23:26 +0000 (+0100)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~53^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1db3214445fbc5144ebc62c314c11082a2d904c4;p=kivitendo-erp.git

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

1db3214445fbc5144ebc62c314c11082a2d904c4