From: Jan Büren Date: Wed, 3 Mar 2010 13:29:36 +0000 (+0100) Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~48 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=964b978f634c75359b1f55a134a36b66f6dd822c;p=kivitendo-erp.git Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp --- 964b978f634c75359b1f55a134a36b66f6dd822c