Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/sites/lib/lang/de.lng

@@ -33,4 +33,3 @@
$wb['error_proxy_requires_url'] = 'Weiterleitungstyp ';
$wb['Subdomain (Vhost)'] = 'Subdomain (vHost)';
?>