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

Conflicts:
	configs/mails.conf

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

diff --cc configs/mails.conf
index 6afd15b,7d32aac..c7bcabe
--- 1/configs/mails.conf
--- 2/configs/mails.conf
+++ b/configs/mails.conf
@@@ -71,6 -71,6 +71,9 @@@ replyto=registration+watch@staff.m4x.or
  from="Polytechnique.org" <validation_modification@polytechnique.org>
  cc="Polytechnique.org" <validation_modification@polytechnique.org>
  
 +[xnet_notification]
 +from="Polytechnique.org" <contact@polytechnique.org>
 +
+ [newsletter_schedule_mailing]
+ from="Gestion des NLs" <support@polytechnique.org>
+ to=br@staff.polytechnique.org

diff --cc modules/admin.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge