From: Holger Lindemann Date: Fri, 3 Jun 2011 06:28:18 +0000 (+0200) Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~25 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=de0f9532013c861dae78aa01b9633284d1ceee7c;p=kivitendo-erp.git Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- de0f9532013c861dae78aa01b9633284d1ceee7c