Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 4 Mar 2009 22:08:40 +0000 (23:08 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 4 Mar 2009 22:08:40 +0000 (23:08 +0100)
commit89cb2025f5f2aed0be3994c89ac473aa11535853
tree6c390a40c6e2c5ede18c5b8ee36c2b873c9d270c
parent4bc5b8f0002d9586b8743129d00de984170a5e8e
parent950a769bb3f3154de64960ffc5cac111263bc8b0
Merge commit 'origin/fusionax' into account

Conflicts:

templates/xnetgrp/mail.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
include/education.func.inc.php
modules/profile/jobs.inc.php
templates/profile/general.tpl
templates/xnetgrp/inscrire.tpl
templates/xnetgrp/mail.tpl