From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 12 Oct 2010 10:23:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~101^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/aef4bc0c25c038294c180ba710099d63d2919a3e?hp=aef4bc0c25c038294c180ba710099d63d2919a3e

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

Conflicts:

	bin/mozilla/cp.pl
---