Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 17:37:02 +0000 (18:37 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 17:37:02 +0000 (18:37 +0100)
commitb57e77e04468990dd5c20d9ddd7826c917e3d4e3
tree7846689ca9e20e90de126424417b5e1dd32d5d04
parent54906b8dc1d98edbf5ae919a7e4413fc8c1be384
parenta16cf1c2e56cc6e4c6cda1e984d2659c4cf0450c
Merge commit 'origin/fusionax' into account

Conflicts:

modules/platal.php
modules/register.php

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