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

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

Conflicts:
	doc/changelog
---