From: Moritz Bunkus Date: Thu, 7 Oct 2010 10:24:48 +0000 (+0200) Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~104^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=be253985ee9b61172d6cd468b3af11801eeb7118;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- be253985ee9b61172d6cd468b3af11801eeb7118