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