Merge branch 'master' into 'master'

Marius Cramer

2014-10-31 474f4595c7aa07c678dceb90d06dfecf51007dd0

 interface/web/mail/mail_domain_edit.php

@@ -176,6 +176,9 @@
            $domain_select .= "<option value=''></option>\r\n";
         }
         $app->tpl->setVar("domain_option", $domain_select);
         $app->tpl->setVar("domain_module", 1);
      } else {
         $app->tpl->setVar("domain_module", 0);
      }