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