From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 13 May 2011 10:57:14 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~37^2~5^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9434c14ab2cb7d10cbe20276d08771c43f9fffc1?hp=9434c14ab2cb7d10cbe20276d08771c43f9fffc1

Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

Conflicts:

	doc/changelog
---