From: Moritz Bunkus Date: Thu, 4 Mar 2010 15:37:29 +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~33^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3c681ed26ad805474401dd2b073f97d667c60f2f;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 3c681ed26ad805474401dd2b073f97d667c60f2f