Merge commit 'origin/fusionax' into account

Conflicts:

	templates/xnetgrp/annuaire.tpl

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

diff --cc modules/newsletter.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc templates/xnetgrp/annuaire.tpl
index 4755dc5,4d73f52..5d60921
--- 1/templates/xnetgrp/annuaire.tpl
--- 2/templates/xnetgrp/annuaire.tpl
+++ b/templates/xnetgrp/annuaire.tpl
@@@ -120,8 -127,8 +120,8 @@@ Le groupe {$asso->nom} compte {$nb_tot
      </td>
      {if $is_admin}
      <td class="center">
-       <a href="{$platal->ns}member/{$user->login()}">{icon name=user_edit title="Edition du profil"}</a>
 -      <a href="{$platal->ns}member/{if $m.x}{$m.email}{else}{$m.uid}{/if}">{icon name=user_edit title="Édition du profil"}</a>
 -      <a href="{$platal->ns}member/del/{if $m.x}{$m.email}{else}{$m.uid}{/if}">{icon name=delete title="Supprimer de l'annuaire"}</a>
++      <a href="{$platal->ns}member/{$user->login()}">{icon name=user_edit title="Édition du profil"}</a>
 +      <a href="{$platal->ns}member/del/{$user->login()}">{icon name=delete title="Supprimer de l'annuaire"}</a>
      </td>
      {/if}
    </tr>