Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

 install/install.php

@@ -191,7 +191,9 @@
   $inst->configure_postfix();

   //* Configure Mailman
   $inst->configure_mailman('install');
   if($conf['mailman']['installed'] == true) {
      $inst->configure_mailman('install');
   }

   //* Configure jailkit
   swriteln('Configuring Jailkit');