From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 3 Mar 2010 13:19:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~44^2~3
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f23f4aa25e53b6eaf15ab66a1482db046e7be127?hp=f23f4aa25e53b6eaf15ab66a1482db046e7be127

Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
	doc/changelog
---