Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-25 b01718a0ae2b53c18c01f1374799a00a0c11279f

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

@@ -14,5 +14,3 @@
$wb['php_fpm_ini_dir_txt'] = 'Putanja do php.ini direktorija';
$wb['php_fpm_pool_dir_txt'] = 'Putanja do PHP-FPM pool direktorija';
?>