Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -4,4 +4,3 @@
$wb['Software Package'] = 'Softwarepaket';
$wb['Modify software package details'] = 'Softwarepaket Einstellungen bearbeiten';
?>