From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 19 Jul 2008 14:02:32 +0000 (+0200)
Subject: Merge branch 'platal-0.9.17'
X-Git-Tag: xorg/0.10.0~172
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=63f06a435ff8e9c058b1dee1eb97fff99606d490;p=platal.git

Merge branch 'platal-0.9.17'

Conflicts:

	classes/plset.php
	include/user.func.inc.php

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

63f06a435ff8e9c058b1dee1eb97fff99606d490