Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:51:08 +0000 (16:51 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 29 Dec 2008 15:51:08 +0000 (16:51 +0100)
1  2 
include/user.func.inc.php

Simple merge