Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-22 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf

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

@@ -266,6 +266,7 @@
$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
$wb['enable_spdy_txt'] = 'Makes SPDY available';
$wb['web_settings_txt'] = 'Web Server';

// New for XMPP
$wb['xmpp_server_txt'] = 'XMPP Server';