Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 2 Mar 2009 21:12:19 +0000 (22:12 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 2 Mar 2009 21:12:19 +0000 (22:12 +0100)
commit3f95a7bd17cd6cd7b218f12787276a485f496f1d
treecf35fba30ea37a1f1a75b4d2b9ca60fe2e665bed
parent2c411733fbb7d90831e144595bb5c09e71b794a6
parente4705641c6135dfbda9f4a0a30a212d21ff874d9
Merge commit 'origin/fusionax' into account

Conflicts:

templates/xnetgrp/annuaire.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/newsletter.php
modules/register.php
templates/xnetgrp/annuaire.tpl