From: Moritz Bunkus Date: Wed, 3 Mar 2010 13:22:50 +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 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6670c0a6720f82726f65bfdec384563634f869c4;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 6670c0a6720f82726f65bfdec384563634f869c4