Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
commit90862af65777b54eb2830b501729236fe50aa110
tree805b1657e8ebb64ab735089879794ab2ec4fbf43
parent767f6985f9d0ed8afaa1eaf9082cc34494001456
parentf2ef84b551f385edbdc07afe5459967c5b89ec60
Merge commit 'origin/master' into fusionax
classes/user.php
include/user.func.inc.php