From: Moritz Bunkus Date: Fri, 5 Mar 2010 10:16:47 +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~23 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=775571669d099f3a905b9e19b3e8560aa669b62e;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 775571669d099f3a905b9e19b3e8560aa669b62e