Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -15,4 +15,3 @@
$wb['eg_domain_tld'] = 'Format: domain.tld.';
$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
?>