Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Florian Schaal

2014-01-04 8edb9c1a3051e03c25eef886171ec9de9c5c3dec

 install/update.php

@@ -289,8 +289,10 @@
      $inst->configure_spamassassin();

      //** Configure Amavis
      swriteln('Configuring Amavisd');
      $inst->configure_amavis();
      if($conf['amavis']['installed'] == true) {
         swriteln('Configuring Amavisd');
         $inst->configure_amavis();
      }

      //** Configure Getmail
      swriteln('Configuring Getmail');