From: Moritz Bunkus Date: Fri, 5 Mar 2010 15:24:01 +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~12^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0519635df1f3b84e4c86acb3c251deb051055c3a;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 0519635df1f3b84e4c86acb3c251deb051055c3a