Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 14 Jan 2009 22:34:15 +0000 (23:34 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 14 Jan 2009 22:34:15 +0000 (23:34 +0100)
commit4ca15c312b905eea712b71d077c7a8b24f9d3b01
tree110a9be2c076faa3b773a5bc952471e49738cf98
parentfd4ab3c7c3fb6dc8f1647e205441c8ac0a2efd67
parent981d6bb2fbf8a249dd5cde339da8bc029b23794b
Merge commit 'origin/fusionax' into account

Conflicts:

include/userset.inc.php
modules/profile/general.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
include/notifs.inc.php
include/user.func.inc.php
modules/profile/general.inc.php
templates/profile/general.tpl