From: Moritz Bunkus Date: Fri, 10 Dec 2010 08:14:53 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~73^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b320453d39fd9ff512debf8c76e770a59aadfa6d;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- b320453d39fd9ff512debf8c76e770a59aadfa6d