From: Moritz Bunkus Date: Thu, 25 Mar 2010 13:43:21 +0000 (+0100) Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~355^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=161005107167fd80ef1d9e95d5066ec142661ee0;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 161005107167fd80ef1d9e95d5066ec142661ee0