From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 20 Feb 2011 18:17:51 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.0~149
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=76362eeb011de4f2cd7825f557643a72494475f9;p=platal.git

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

Conflicts:
	configs/mails.conf

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

76362eeb011de4f2cd7825f557643a72494475f9
diff --cc configs/mails.conf
index 6afd15b,7d32aac..c7bcabe
--- a/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