Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

 server/plugins-available/mail_plugin.inc.php

@@ -193,7 +193,8 @@
      $mailTarget       = $data["new"]["email"];
      $mailSubject      = "=?utf-8?B?".base64_encode($welcome_mail_subject)."?=";

      mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders);
      //* Send the welcome email only on the "master" mail server to avoid duplicate emails
      if($conf['mirror_server_id'] == 0) mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders);
      
   }