From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 30 Jun 2008 20:22:58 +0000 (+0200)
Subject: Merge branch 'platal-0.9.16' into platal-0.9.17
X-Git-Tag: xorg/0.9.17~72
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=527ccdb5d9e3a120168331f4aa3070f6c574228e;p=platal.git

Merge branch 'platal-0.9.16' into platal-0.9.17
---

527ccdb5d9e3a120168331f4aa3070f6c574228e
diff --cc configs/mails.conf
index 3f75eac,861ede4..428ccb8
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@@ -33,11 -33,11 +33,11 @@@ to=hotliners@staff.polytechnique.or
  
  [geoloc_error]
  from=webmaster@polytechnique.org
- to=geoloc@staff.polytechnique.org
+ to=non-geoloc@staff.polytechnique.org
  
  [mails_ax]
 -from="Amicale des Anciens de l'X" <info@amicale.polytechnique.org>
 -replyto=info@amicale.polytechnique.org
 +from="Amicale des Anciens de l'X" <reponses@amicale.polytechnique.org>
 +replyto=reponses@amicale.polytechnique.org
  
  [payment_ready]
  from="Gestion des paiements" <support@polytechnique.org>