Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -13,4 +13,3 @@
$wb['page_of_txt'] = 'von';
$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
?>