From: Bernd Blessmann Date: Fri, 13 May 2011 07:00:35 +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^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ba5d3542135b3408a011ce42d2311fa3aefa7f38;p=kivitendo-erp.git Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- ba5d3542135b3408a011ce42d2311fa3aefa7f38