From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 25 May 2011 05:12:08 +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~8^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b5451844204c5ea77936dbca6194bde8e0b5c906;p=kivitendo-erp.git

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

b5451844204c5ea77936dbca6194bde8e0b5c906