Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:18:59 +0000 (21:18 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:18:59 +0000 (21:18 +0100)
commita415be4f1460f3702f9c07667caae34b7489d429
tree1a5f209fdcb5f8ae6f88182af4f1ed58dc4c883a
parentf2ef84b551f385edbdc07afe5459967c5b89ec60
parentedc5509597a4a1710d603831517958b526fd4751
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

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