From: Sven Schöling Date: Fri, 21 Jan 2011 10:42:32 +0000 (+0100) Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.2beta2^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=191f8d56e15187cf525d0cf4912f4d15768e527b;p=kivitendo-erp.git Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- 191f8d56e15187cf525d0cf4912f4d15768e527b