From: Moritz Bunkus Date: Mon, 8 Mar 2010 12:34:54 +0000 (+0100) Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.1beta1^0 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=684e4405d2a330043bcdb99fa5a1bb39caed7601;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 684e4405d2a330043bcdb99fa5a1bb39caed7601