From: Moritz Bunkus Date: Thu, 30 Dec 2010 15:57:11 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~17^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=10150f2fb96a248c46b65cea5859d7f1dd11340e;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- 10150f2fb96a248c46b65cea5859d7f1dd11340e