From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Thu, 2 May 2013 08:55:07 +0000 (+0200)
Subject: Merge branch 'master' into currency
X-Git-Tag: release-3.1.0beta1~401^2~21^2~12
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/a23454bb1b039a31b7f77710ff663fa9152d530c?hp=a23454bb1b039a31b7f77710ff663fa9152d530c

Merge branch 'master' into currency

Conflicts:
	locale/de/all
---