Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:50:01 +0000 (16:50 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:50:01 +0000 (16:50 +0100)
commite8a898662eeafa5201082067a7aac46573884ebb
tree52fadf5c2e24507fa715bf27298c02a13d23b0a5
parent09e1667a733566429a05adff5980e04e23ed8d88
parentde954f84cfcf2f44b5716c0f445495e09c90e6d5
Merge commit 'origin/master' into fusionax
include/user.func.inc.php