From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 8 May 2014 11:08:28 +0000 (+0200)
Subject: Merge branch 'pflichtenhefte'
X-Git-Tag: release-3.2.0beta~467
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/766f5705ecb9cd56adfbffd94c871959bb64c6fd?ds=sidebyside;hp=766f5705ecb9cd56adfbffd94c871959bb64c6fd

Merge branch 'pflichtenhefte'

Conflicts:
	js/locale/de.js
---