From: Moritz Bunkus Date: Mon, 27 Dec 2010 16:14:57 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~60^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=694ced449e7ba97d19119d6a03080f8c5d0f3e04;p=kivitendo-erp.git Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp --- 694ced449e7ba97d19119d6a03080f8c5d0f3e04