Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 install/update.php

@@ -326,9 +326,9 @@
         $inst->configure_postfix('dont-create-certs');

         if($conf['dovecot']['installed'] == true) {
         //* Configure dovecot
         swriteln('Configuring Dovecot');
         $inst->configure_dovecot();
            //* Configure dovecot
            swriteln('Configuring Dovecot');
            $inst->configure_dovecot();
         } elseif ($conf['courier']['installed'] == true) {
            //** Configure saslauthd
            swriteln('Configuring SASL');