From: Moritz Bunkus Date: Mon, 28 Nov 2011 15:46:37 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta1~157^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1167841707ec8fe4ac5964830cd292f129e9f98d;p=kivitendo-erp.git Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- 1167841707ec8fe4ac5964830cd292f129e9f98d