From: Moritz Bunkus Date: Wed, 29 Dec 2010 11:43:51 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~48^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0672f4afe29c2ba6537d90f4a0ff7eeff78ccae6;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- 0672f4afe29c2ba6537d90f4a0ff7eeff78ccae6