Merge branch 'xorg/maint'

Conflicts:
	include/newsletter.inc.php

diff --cc include/newsletter.inc.php
index ded8520,5ceabc0..313d98d
--- 1/include/newsletter.inc.php
--- 2/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@@ -1231,12 -1245,7 +1251,14 @@@ class NLIssu
       */
      public function sendTo($user, $hash = null)
      {
+         global $globals;
++
 +        // Don't send email to users without an address
 +        // Note: this would never happen when using sendToAll
 +        if (!$user->bestEmail()) {
 +            return;
 +        }
 +
          $this->fetchArticles();
  
          if (is_null($hash)) {