From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 13 May 2011 12:52:44 +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^2^2^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9bb32c2257f2eaaf500c9b45e395a60ade1b37f3;p=kivitendo-erp.git

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

9bb32c2257f2eaaf500c9b45e395a60ade1b37f3