From: Bernd Blessmann <bibi@online.de>
Date: Mon, 9 Jan 2012 17:07:02 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~78^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5c5d0641f55504c2e9ed860633caba14d313981d?hp=5c5d0641f55504c2e9ed860633caba14d313981d

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

Conflicts:
	doc/changelog
---