Merge branch 'master' into 'master'

Marius Cramer

2015-07-07 c755f8131c38a3f0c5f97cf029959789aae133f3

Merge branch 'master' into 'master'

fixed typo in installer_base.lib.php

See merge request !207

 install/lib/installer_base.lib.php

@@ -157,7 +157,7 @@
        if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
        if(is_installed('iptables') && is_installed('bastille-netfilter')) $conf['bastille']['installed'] = true;
        if(is_installed('metronome') && is_installed('metronomectl')) $conf['xmpp']['installed'] = true;
        if(is_installed('spamassassin')) $conf['spamassasin']['installed'] = true;
        if(is_installed('spamassassin')) $conf['spamassassin']['installed'] = true;
        if(is_installed('vlogger')) $conf['vlogger']['installed'] = true;
        if(is_installed('cron')) $conf['cron']['installed'] = true;