From: Moritz Bunkus Date: Thu, 30 Dec 2010 15:34:53 +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~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a1124f720cf695519f29c41220cac7ff6c1ecf1b;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- a1124f720cf695519f29c41220cac7ff6c1ecf1b