Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:22:07 +0000 (21:22 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:22:07 +0000 (21:22 +0100)
commit1ebf2b93bef5ab13342293a34041b9a68ed31f03
treeb03484cea5dbba84d1a422720424d61c00fabe95
parentf9743cf19cc339b12c8570742e082c6836f102c1
parent8320b6fba6fa245dd71ae9c11b2a2a03f923d15d
Merge commit 'origin/fusionax' into account

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
classes/xorgsession.php
modules/admin.php
modules/register.php