Merge remote-tracking branch 'schoene/master'

Marius Cramer

2014-01-03 53f4a0b4229550275451cc9bc687c60b5f7391ea

 install/autoupdate.php

@@ -228,8 +228,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');