Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Jun 2008 14:34:27 +0000 (16:34 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Jun 2008 14:34:27 +0000 (16:34 +0200)
commitde08a5eb35a0daa5ea1817532f02367e0f0edbec
treedd2e85452ca89d931e740fd67c1fbc4f8252e98b
parente64c8b6163eabdd0b94f9fca2f8cf4106aa9bb7a
parent26d21e6866e122512c79c15e1d6851455d162c5b
Merge branch 'platal-0.9.17'

Conflicts:

classes/session.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>