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