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