Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 ab3c7dfb89aee966d336c2d68d0220d5a1b7893e

Merge branch 'stable-3.1'

 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