From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 30 Dec 2008 22:33:45 +0000 (+0100)
Subject: Merge commit 'origin/fusionax' into account
X-Git-Tag: xorg/1.0.0~332^2~437
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=384712208a260ae1b5b7e90ac95f0df84ffbe8af;p=platal.git

Merge commit 'origin/fusionax' into account

Conflicts:

	classes/user.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

384712208a260ae1b5b7e90ac95f0df84ffbe8af