Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 8 Mar 2009 18:54:52 +0000 (19:54 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 8 Mar 2009 18:54:52 +0000 (19:54 +0100)
commita6391000e89c59f3c26d1a62bb06857df706bf50
tree6f19acd6f84a2c64d32c7a25b83d51ef9f6a1dbf
parentf74fb084d80d48a507f3c847e36fc1014647d601
parent00ca8c0923077700cc37cfd8f2b385ac4d115eff
Merge commit 'origin/fusionax' into account

Conflicts:

include/userset.inc.php
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/jobs.inc.php
templates/include/minifiche.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/jobs.inc.php
modules/profile/mentor.inc.php