Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 21 Jan 2009 12:49:40 +0000 (13:49 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 21 Jan 2009 12:49:40 +0000 (13:49 +0100)
commit32742f846e13a7806dde6b7b912c423a46f933d8
tree86aea6b15675c24d2ab2cbb4f50b5c97b6320ed0
parent455ea0c945b03435bd30ded9c92b7f2619f42af0
parentbc27980b1cd74417ced8d55469494cda462badfe
Merge commit 'origin/fusionax' into account

Conflicts:

modules/profile/general.inc.php

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