From: Moritz Bunkus Date: Fri, 5 Mar 2010 13:36:40 +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~17 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=92d28f856f4dd9eee0b35f30bbf876744b9426aa;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- 92d28f856f4dd9eee0b35f30bbf876744b9426aa