From: Moritz Bunkus Date: Thu, 4 Mar 2010 09:18:06 +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~36^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f20a20b6643c9c67f62481e9738514f747a8c4b4;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- f20a20b6643c9c67f62481e9738514f747a8c4b4