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

Till Brehm

2014-01-03 c3570e5419af1f86a1662239674087988eb737c4

 install/install.php

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