Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
	core
	modules/payment.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc modules/payment.php
Simple merge

diff --cc modules/xnetgrp.php
index d5a27c7,a558cbf..b894d64
--- 1/modules/xnetgrp.php
--- 2/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@@ -249,10 -249,10 +249,9 @@@ class XnetGrpModule extends PLModul
          global $globals;
  
          $page->changeTpl('xnetgrp/mail.tpl');
-         $mmlist = new MMList(S::v('uid'), S::v('password'),
-                            $globals->asso('mail_domain'));
+         $mmlist = new MMList(S::user(), $globals->asso('mail_domain'));
          $page->assign('listes', $mmlist->get_lists());
          $page->assign('user', S::user());
 -        $page->addJsLink('ajax.js');
  
          if (Post::has('send')) {
              S::assert_xsrf_token();