From: Moritz Bunkus Date: Wed, 3 Mar 2010 12:24:00 +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~48^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=64dde83b543cc17701993dfea6afdec28f3c7e1f;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 64dde83b543cc17701993dfea6afdec28f3c7e1f