From: Moritz Bunkus Date: Thu, 25 Aug 2011 12:26:07 +0000 (+0200) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.7.0beta1~322 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a36ab47a71cde9bb7eda8f01caa823cdedc36208;p=kivitendo-erp.git Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- a36ab47a71cde9bb7eda8f01caa823cdedc36208