From: Moritz Bunkus Date: Fri, 21 Jan 2011 14:43:56 +0000 (+0100) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.2beta2^0 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6618641eb6561393c1a35d93db61d3bb4bbea402;p=kivitendo-erp.git Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- 6618641eb6561393c1a35d93db61d3bb4bbea402