Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/dns/lib/lang/de_dns_template_list.lng

@@ -4,4 +4,3 @@
$wb['name_txt'] = 'Name';
$wb['add_new_record_txt'] = 'Neuen Eintrag hinzufügen';
?>