From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 19 Apr 2011 12:10:33 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~35
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7f34b3c1f69619eaf3c41945ab22cf21883bb945;p=kivitendo-erp.git

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

7f34b3c1f69619eaf3c41945ab22cf21883bb945