From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 23 May 2011 08:46:12 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~8^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9f522077cdc739cbb17564f76e31e9b7ce7ab4f1;p=kivitendo-erp.git

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

9f522077cdc739cbb17564f76e31e9b7ce7ab4f1