Merge commit 'origin/master' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 21 Sep 2008 20:24:50 +0000 (22:24 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 21 Sep 2008 20:24:50 +0000 (22:24 +0200)
commit21c7c593d7100a887f984c49a82c03eb32169fc4
tree3e4e97f54bf5bea8c859cf41fb7ae4b8c7a61549
parent805f3d1679a53bb04fff34619c171a1381068612
parent343e22c25d384cb09e5cdc77bb861fcf6c60a653
Merge commit 'origin/master' into hruid

Conflicts:
include/emails.inc.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
include/emails.inc.php
include/userset.inc.php
modules/admin.php
modules/email.php
modules/xnetevents.php
modules/xnetevents/xnetevents.inc.php
modules/xnetgrp.php
templates/emails/redirect.tpl
templates/emails/rewrite-in.mail.tpl
templates/include/minifiche.tpl