Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 31 Dec 2008 13:44:42 +0000 (14:44 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 31 Dec 2008 13:44:42 +0000 (14:44 +0100)
commit6e909db8e8f8a25a0d44e3ff74bcc5f76eb2ea92
treeae57f2b6f208c93e6fb488f79699708216dfdf16
parent191711d5aa707ee93b1f6ad386774e912637244d
parentd1319488b2e06d8e1b943db37247f571d9b393dc
Merge commit 'origin/fusionax' into account

Conflicts:

classes/user.php

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