Merge branch 'master' into 'master'

Marius Cramer

2015-03-31 e146fe8cebdf9201ccd67b37333a6c423ac5c1f4

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -75,9 +75,9 @@
    */
   function get_amavis_config() {
      $pos_config=array(
         '/etc/amavisd.conf',
         '/etc/amavisd.conf/50-user',
         '/etc/amavis/conf.d/50-user',
         '/etc/amavisd.conf',
         '/etc/amavisd/amavisd.conf'
      );
      $amavis_configfile='';