Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

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

@@ -280,4 +280,6 @@
$wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>