From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 22 Jun 2008 14:34:27 +0000 (+0200)
Subject: Merge branch 'platal-0.9.17'
X-Git-Tag: xorg/0.10.0~190
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=de08a5eb35a0daa5ea1817532f02367e0f0edbec;p=platal.git

Merge branch 'platal-0.9.17'

Conflicts:

	classes/session.php

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

de08a5eb35a0daa5ea1817532f02367e0f0edbec