Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -48,4 +48,3 @@
$wb['Do OS-Update'] = 'Betriebssystem Update';
$wb['Do ISPConfig-Update'] = 'ISPConfig Update';
?>