From: G. Richardson <information@kivitendo-premium.de>
Date: Tue, 5 May 2015 07:56:42 +0000 (+0200)
Subject: Merge branch 'bankerweiterung_und_skonto'
X-Git-Tag: release-3.3.0beta~106
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/a87694dc525b4eabff11029f1e5401621e2bd3bc?ds=inline;hp=a87694dc525b4eabff11029f1e5401621e2bd3bc

Merge branch 'bankerweiterung_und_skonto'

Conflicts:
	doc/changelog
	locale/de/all
---