From: C. Braun <information@lx-office-hosting.de>
Date: Fri, 13 May 2011 13:46:47 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~35
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=915e943a8fa8ab2a32576d4609632d598898cf20;p=kivitendo-erp.git

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

915e943a8fa8ab2a32576d4609632d598898cf20