Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 interface/web/tools/lib/lang/se_import_ispconfig.lng

@@ -21,4 +21,3 @@
$wb['import_user_filter_txt'] = 'Importera användarfilter';
$wb['import_spamfilter_txt'] = 'Importera spamfilter';
?>