Merge branch 'platal-0.9.16'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Jun 2008 10:28:16 +0000 (12:28 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Jun 2008 10:28:16 +0000 (12:28 +0200)
commitafada5eb6cf23005f775fbab0d421c27393172f1
treef9b256130d5ecfbcc8c75e5a18382a7afdc85141
parent61e0e8619a9e391d9536d1af3c8cd441491bbc99
parent6a909b16b28ef0709deea9942ca95830b0ab7324
Merge branch 'platal-0.9.16'

Conflicts:

modules/auth/auth.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/auth/auth.inc.php