Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 22 Dec 2008 10:42:41 +0000 (11:42 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 22 Dec 2008 10:42:41 +0000 (11:42 +0100)
commit55d55de87a79b7a703be4ef2b6295a1277ad9875
tree358a136a450bb3644a260f6c092c4e8a07a06d1b
parent8cd3dcccfa281be67f58c53716ad1910dc31f625
parent5818ad2405cfb20b4cb906711040ab6681f3209b
Merge commit 'origin/fusionax' into account

Conflicts:

classes/xorgsession.php
modules/register.php

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