From: Moritz Bunkus Date: Fri, 5 Mar 2010 09:34:36 +0000 (+0100) Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~25 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=97e073c4843190114bb8b094ef11c8d21d039df1;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 97e073c4843190114bb8b094ef11c8d21d039df1