Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

1
2
3
4
5
6
7
8
9
10
11
12
Component "xmpp.{tmpl_var name='domain'}" "http"
        modules_enabled = {
                "server_status",
                "webpresence"
        };
        server_status_basepath = "/xmppd/";
        server_status_show_hosts = {
{tmpl_var name='status_hosts'}
        };
        server_status_show_comps = {
{tmpl_var name='status_comps'}
        };