Merge branch 'master' into 'master'

Marius Cramer

2015-07-10 4e5e9b5acfdfddc1d8b671890d271a53e5598862

 install/dist/lib/fedora.lib.php

@@ -355,7 +355,7 @@
         exec ("postconf -M dovecot.unix", $out, $ret);
         $add_dovecot_service = @($out[0]=='')?true:false;
      } else { //* fallback - postfix < 2.9
         $content = rf($config_dir'/master.cf');
         $content = rf($config_dir.'/master.cf');
         $add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
      }
      if($add_dovecot_service) {