From: Moritz Bunkus Date: Wed, 3 Mar 2010 16:36:49 +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~38^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0d295843fa8bdcc543e9c68d8b6de056fb4f092e;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 0d295843fa8bdcc543e9c68d8b6de056fb4f092e