Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 9f65de0b6bbfb0824e34088029e4f593a28303e1

Merge branch 'master' into 'stable-3.1'

Master



See merge request !273

 install/dist/conf/centos70.conf.php

@@ -144,7 +144,7 @@

//* Amavisd
$conf['amavis']['installed'] = false; // will be detected automatically during installation
$conf['amavis']['config_dir'] = '/etc';
$conf['amavis']['config_dir'] = '/etc/amavisd';
$conf['amavis']['init_script'] = 'amavisd';

//* ClamAV