From: Moritz Bunkus Date: Wed, 22 Jul 2009 14:19:25 +0000 (+0200) Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~349 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f373f98d676d433b7db20e3e74435a34029cac0f;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- f373f98d676d433b7db20e3e74435a34029cac0f