From: Moritz Bunkus Date: Fri, 2 Sep 2011 14:05:47 +0000 (+0200) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.7.0beta1~310^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=62ffcb1aa838fa3d4e266aef02918574bc7ca6be;p=kivitendo-erp.git Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- 62ffcb1aa838fa3d4e266aef02918574bc7ca6be