From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 12 Jul 2010 14:13:05 +0000 (+0200)
Subject: Merge branch 'template_locales'
X-Git-Tag: release-2.6.2beta1~331
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/2d3f862b7af94f31860dd264eef7c1bc7de7eae2?hp=2d3f862b7af94f31860dd264eef7c1bc7de7eae2

Merge branch 'template_locales'

Conflicts:
	templates/webpages/admin/edit_user_master.html
	templates/webpages/admin/list_users_de.html
	templates/webpages/is/form_header_master.html
---