From: Moritz Bunkus Date: Fri, 13 May 2011 13:35:34 +0000 (+0200) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~25^2~35^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=27ae86579fb8833067e9d6c02cf5429d98b28449;p=kivitendo-erp.git Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- 27ae86579fb8833067e9d6c02cf5429d98b28449