Merge commit 'origin/master' into fusionax

author Florent Bruneau <florent.bruneau@polytechnique.org>

Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)

committer Florent Bruneau <florent.bruneau@polytechnique.org>

Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
author Florent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
committer Florent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
diff --cc classes/user.php
Simple merge
diff --cc include/user.func.inc.php
Simple merge
author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Tue, 30 Dec 2008 22:31:31 +0000 (23:31 +0100)
		1	2
classes/user.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/user.func.inc.php	patch \|	diff1 \|	diff2 \|	blob \| history