Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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

@@ -22,3 +22,4 @@
$wb['import_spamfilter_txt'] = 'Importovat spamový filter';
?>