From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 7 Nov 2012 14:22:14 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~45^2^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/872f04a75528d55c3987c09fa0445451c35c6ef9?hp=872f04a75528d55c3987c09fa0445451c35c6ef9

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

Conflicts:
	doc/html/ch03s02.html
	doc/html/ch04.html
	doc/html/index.html
	doc/kivitendo-Dokumentation.pdf
---