Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 18:15:12 +0000 (19:15 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 18:15:12 +0000 (19:15 +0100)
commit7162a93f4a23efadcc2fcfa9b081a2879f4194bc
tree7f48b60806c308992661234fac9aa864b3bf09e9
parent0238f72607c21f6eeb09b6ace61a368c563b5b30
parent4b239f6e6cb26cdd814b42f3efcbcae40fa862a4
Merge commit 'origin/fusionax' into account

Conflicts:

classes/xorgsession.php
core
modules/platal.php
modules/register.php

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